Commit Graph

46 Commits

Author SHA1 Message Date
Shyotl
a6a69caa4f Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
2012-02-24 13:21:59 -06:00
Shyotl
bdeead6f8e Updated LLView:
-Removed a few extra unneeded virtuals
 -Pulled tabgroups out of llpanel and into LLView
 -removeChild doesn't support delete. Delete manually.
 -addChildAtEnd renamed to addChildInBack
 -getScreenRect renamed to calcScreenRect
 -added calcScreenBoundingRect and calcBoundingRect(which updateBoundingRect calls
 -General cleanup. Someone at LL figured out that dynamic_cast actually exists.
Fixed PieMenu not reliably centering on cursor.
Fixed context menu crash in line and text editors.
Classes with LLEditMenuHandler as a base do not need to set gEditMenuHandler to NULL, since LLEditMenuHandler's dtor does that already!
2012-02-21 21:59:22 -06:00
Siana Gearz
f7cc9c4d33 Hopefully more correctness in grid manager editor 2012-02-19 00:42:23 +01:00
Shyotl
1810a7c7f9 Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there. 2012-02-18 01:58:02 -06:00
Siana Gearz
acf378e9f2 Auto-version system 2012-02-09 14:03:49 +01:00
Shyotl
83e8a9076b Several gl calls now wrapped via LLRender (gGL) as prep for future changes:
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
2011-11-21 15:55:44 -06:00
Siana Gearz
0130423d93 Rev changed grid management incompatibly -.- 2011-10-15 04:46:35 +02:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00
Shyotl
417f5084b4 Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places. 2011-09-03 19:30:42 -05:00
RevolutionSmythe
b8cd305f89 Get rid of grid nicks, and just use the Grid Name everywhere (its cleaner, and one less thing to fill out). 2011-08-18 20:56:35 +02:00
RevolutionSmythe
d84140ead9 Add Aurora to the grid info platform list. Attempt to stop sending "resident" as the last name, except with Second Life. 2011-08-18 20:56:03 +02:00
Siana Gearz
ee9b689cb4 OK, more login unbreaking =.= 2011-07-26 06:49:33 +02:00
Siana Gearz
2f571a0393 Signed cleanup on texture fetch and one login bug fix 2011-07-26 01:46:53 +02:00
Siana Gearz
ac00c9b62e Login panel, name reset fix 2011-06-19 00:39:06 +02:00
Siana Gearz
0d0e9bec5e More login panel changes 2011-06-17 00:43:53 +02:00
Siana Gearz
c82cf613a6 Better saved logins, with grid
Please, someone throw away the oodles of dead, confusing and redundant code -.-
2011-06-15 15:14:55 +02:00
Siana Gearz
3abc778f2c Empty splash page workaround 2011-05-15 20:19:26 +02:00
Aleric Inglewood
1ced64e0b4 Add LLWeb::curlEscape
Since curl 7.21.2 - (October 13 2010), curl_escape (a deprecated
function that will be removed in the future) changed it's behavior
and no longer escapes the characters '-', '.', '_' and '~'.

The only reasonable solution for us is to stop using it and
use our own version that mimics the old behavior. The only
other alternative would be to rename every .xml file with
escaped characters in their name upon installation, depending
on the behavior of the installed libcurl (on standalone anyway).
However, if you add to that in the future curl_escape has to
be replaced with curl_easy_escape, which is far from easy to
call as it requires a CURL to be passed for which LL invented
a wrapper in libllmessage, but did hide that (Curl::Easy is
only defined in a .cpp file), then we're better of just using
our own function, which I named LLWeb::curlEscape.
2011-05-02 20:15:50 +02:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Siana Gearz
0f038bbffc Grid manager stuff, part. debrand 2011-04-02 05:03:10 +02:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Shyotl
653053e303 Fixed LLErrors killing the viewer when no username is provided on login. 2011-02-16 22:32:44 -06:00
Siana Gearz
df03bbda0c Resident friendly login panel 2011-02-13 22:00:10 +01:00
Siana Gearz
72c4c52372 Assorted fixes 2011-02-12 23:33:11 +01:00
Siana Gearz
2550e2b6f2 OpenGrid protocol is dead. byebye o/ 2011-01-31 19:59:28 +01:00
Siana Gearz
d962b05a9e Hippo Grid Manager 2011-01-29 18:23:56 +01:00
Siana Gearz
18149fdfed RLVa fixes 2010-11-07 18:52:25 +01:00
Siana Gearz
740b570168 Merged in RLVa. Viewer broken! 2010-11-07 05:05:47 +01:00
Beeks
2faa13a37b Collection of minor edits from Imprudence to fix bugs, etcetera. Also updated the version.
Also made the version almost entirely hard-coded to remove any remnants of Inertia's spoofer.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-21 14:49:46 -04:00
Beeks
0be0d095fc TPV Compliance issues resolved:
Message Builder is removed entirely as per requested
Message Log was updated to be less dependent on the message builder for later removal
Version reporting was fixed - Missed some tidbits from Inertia removal

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-06 23:16:43 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
Hazim Gazov
955788d72b don't ever use IP spoofing protection on a non-LL grid. display the warning near the slider that there may be blue screens 2010-08-18 05:00:29 +00:00
Hazim Gazov
86d0743f63 Prevent people from spoofing using any of the emerald channels as a spoofed channel name 2010-08-09 05:31:45 +00:00
Hazim Gazov
c5118d48b8 If we haven't set a build number, make up a random one (helps with evading detection) 2010-07-28 23:34:41 +00:00
phr0z3nt04st
7f8b62d70e Massive commit, mainly client tag stuff and random id0 and random mac,
red name if not actually in the sim in active speakers for voice.
2010-07-01 22:16:03 -05:00
Hazim Gazov
d12ba41378 fucking LLSD got up in my grill. 2010-05-06 19:37:50 -03:00
Hazim Gazov
4b06f2877f fixed version spinners on login panel, I'm a hurrdurr 2010-05-06 19:35:24 -03:00
Hazim Gazov
d632fec70d AND DON'T DO THAT AGAIN 2010-05-03 15:48:22 -03:00
Hazim Gazov
a63e0dea6d just gonna commit this so I can undo it all proper-like 2010-05-03 15:44:01 -03:00
Hazim Gazov
1dd304c4ab I had the wrong names in the panel, fixed. Version spoofing should work now 2010-05-01 01:02:54 -03:00
Hazim Gazov
ca9a3c05c8 fixed up the login panel some more, all of the version spinners are there 2010-04-29 07:00:16 -03:00
Hazim Gazov
ab2e1c9702 fixed up the login panel a tiny bit 2010-04-28 16:31:33 -03:00
Hazim Gazov
5c25824144 should be able to spoof versions as well now, too 2010-04-28 15:44:27 -03:00
Hazim Gazov
32734e0de3 got mac and id0 spoofing working 2010-04-28 08:51:12 -03:00
Hazim Gazov
e204d77d52 added some settings from SLPE 2010-04-23 09:34:47 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00