Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
575 Commits 20 Branches 51 Tags
f079cf07aeda2293987c6f6afedbde4d9ca10b08
Commit Graph

575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siana Gearz
f079cf07ae Puh some fixes mostly to ripout 2010-10-18 22:39:19 +02:00
Siana Gearz
2df81c3580 Build fixes 2010-10-18 20:43:10 +02:00
Siana Gearz
5a67fcd623 Revert "THE BIGGIE." 
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
 2010-10-18 18:27:09 +02:00
Siana Gearz
49cb86adae Crude attempt at backporting more recent animation engine from 2.x. Dont wanna walk like a duck 2010-10-18 14:41:25 +02:00
Siana Gearz
293e6a5487 Merge remote branch 'upstream/master' 
Conflicts:
	indra/llcommon/llversionviewer.h
	indra/newview/English.lproj/InfoPlist.strings
	indra/newview/llappviewerlinux.cpp
 2010-10-18 14:01:09 +02:00
Siana Gearz
3d60deaf31 Worked through rejects from sg1.5 merge. Went in smoothly O.o 2010-10-18 13:45:04 +02:00
Siana Gearz
babc0dc420 Snowgobe 1.4.2 to 1.5.0 patch part 1 (no rejects) 2010-10-18 10:25:32 +02:00
November
58eff984da Yeah screw this, everything set here was absolutely correct to begin with and I shouldn't be applying patches while half awake when requested. 
This reverts commit de947507b1.
 2010-10-14 16:43:32 -07:00
November
de947507b1 Pulling Snowglobe 1.5's fix for loading oblong sculpts. 2010-10-14 16:27:22 -07:00
November
24cb0445c5 Revert "Should fix issues rezzing oblong sculpties." 
This reverts commit 5a80be37fd.
 2010-10-14 16:25:14 -07:00
November
5a80be37fd Should fix issues rezzing oblong sculpties. 2010-10-14 16:18:19 -07:00
Siana Gearz
8148416f42 Who wants to lag out? -.- 2010-10-14 13:08:38 +02:00
November
8f5227f52c Committing version. 2010-10-13 15:04:44 -07:00
Beeks
18594be313 TPV Compliance fixes - One I thought was handled and one I thought wasn't an issue. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-12 14:11:09 -04:00
Siana Gearz
fb89cb11d8 Fixes for that merge, making it build. 2010-10-11 12:59:25 +02:00
Beeks
21d092705c fixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfixfix 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-10 21:55:19 -04:00
Siana Gearz
6c8080d1a6 Merge remote branch 'shyotl/master' 2010-10-11 03:53:52 +02:00
Siana Gearz
6192edf353 Revert "Fixes for Linux ID0" 
This reverts commit 184de6a6c5.
 2010-10-11 03:09:44 +02:00
unknown
fe9a3d2ba2 Converted frequently occuring setting lookups to LLCachedControl 
Added LLObjectList::getAvatar(LLUUID) for type-safe and quicker lookup
Added F32 overload to LLSD because using F64 needlessly is silly.
   (And its lack of F32 overload caused issues with LLCachedControl<F32>)
 2010-10-07 21:36:13 -05:00
unknown
49e4959bf5 More vc2010 stuff (part deux) 2010-10-07 21:23:50 -05:00
Siana Gearz
5fc7257e37 Merge remote branch 'upstream/master' 2010-10-07 12:52:13 +02:00
Siana Gearz
7f678af5b7 Merge branch 'master' of github-siana:siana/Ascent 2010-10-07 11:35:53 +02:00
Siana Gearz
aacbd1d85a Ability to edit wearable objects from inventory 
Ported from Phoenix
 2010-10-07 02:40:14 +02:00
Siana Gearz
b077df7d25 Fixed syntax error in launcher for Linux users. 2010-10-07 02:38:46 +02:00
Beeks
0ef24cfda0 Oh right these might be needed too. e.e 2010-10-06 14:49:48 -04:00
Beeks
015bfe5bd7 Preliminary work for Day Cycle selecting. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-06 14:44:29 -04:00
Beeks
d08bf75d14 Hopefully this will allow Linden tag coloring. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-06 14:27:54 -04:00
Beeks
23dd56a865 Corrected the pie menu options. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-06 14:26:15 -04:00
Beeks
668b7f6096 Updates to Beeks' pet project. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-05 11:14:49 -04:00
Beeks
9eaf82378e Adding ComboBGColor to default skin. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-05 11:13:19 -04:00
Beeks
0dd4f4c1b6 Minor adjustment to lltexturectrl, removing a duplicate call. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-05 11:11:13 -04:00
Beeks
184de6a6c5 Fixes for Linux ID0 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-05 11:09:05 -04:00
Beeks
8feb018af2 Merge branch 'master' of github.com:Beeks/Ascent 2010-10-05 11:06:09 -04:00
Beeks
3a8ae75fb8 Fix for Viewer 2 breaking away timeouts. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-05 11:03:03 -04:00
Beeks
be42b299b6 MU-style poses for IMs. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-05 10:57:53 -04:00
November
49aee73aea Fixing GCC 4.0 build issue. Thanks again, Shyotl! 2010-10-04 23:38:00 -07:00
unknown
227a72c421 VC2010 cmake alterations. Lib stuff not included. 2010-10-05 01:34:35 -05:00
unknown
2a584cb0fd Happy now, GCC? 2010-10-05 01:33:35 -05:00
November
fa0a4a62c9 Fixing a Microsoftism. Thanks Shyotl! 2010-10-04 23:21:52 -07:00
November
cd5cd59ce0 When are these ever used? Causes a strange build error on OS X. 2010-10-04 23:18:14 -07:00
CharleyLevenque
89f23eb868 Bunch of fixes from Shyotl 2010-10-02 17:10:46 -04:00
CharleyLevenque
a3cb93ac3a Merge branch 'master' of github.com:Beeks/Ascent 2010-10-02 12:05:56 -04:00
CharleyLevenque
8a78a06a10 Unfinished code related to Contact Groups 2010-10-02 12:05:14 -04:00
unknown
b2bd45eed8 -Screwed around with SSE2. 
-Added ReleaseSSE2 as a build target.
-LL_VECTORIZE is silly and breaks things...
-Small little tweaks.

I have not tested if the cmake alterations work under linux and darwin. Hollar if broken.
 2010-10-02 02:13:17 -05:00
Beeks
810fff09d6 -Sanity checks from snowglobe. ... 
-Null terminated a string buffer.
-Mutex locks are expensive.
-Realloc is my friend.
-But leaks are not.
-Nor are unused variables.
-And buffer overruns should get lost.
-bindManual shouldnt return failure if texture's already bound.
-Pulled windlight and classic clouds apart into unique rendertypes.
-'Client or Account' savedsettings stuff is now moar bettar. (and efficient)
-Replaced LLSavedSettingsGlue with something that supports gSavedSettings, gSavedPerAccountSettings, and gCOASavedSettings

-Added 'Enable Classic Clouds' checkbox to ascet performance settings panel
-New cards added to gpu table.
-General cleaning...
-How2spell 'dimensions'?

Via Shyotl

Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-01 22:51:50 -04:00
unknown
3e8a7172db -Sanity checks from snowglobe. ... 
-Null terminated a string buffer.
-Mutex locks are expensive.
-Realloc is my friend.
-But leaks are not.
-Nor are unused variables.
-And buffer overruns should get lost.
-bindManual shouldnt return failure if texture's already bound.
-Pulled windlight and classic clouds apart into unique rendertypes.
-'Client or Account' savedsettings stuff is now moar bettar. (and efficient)
-Replaced LLSavedSettingsGlue with something that supports gSavedSettings, gSavedPerAccountSettings, and gCOASavedSettings

-Added 'Enable Classic Clouds' checkbox to ascet performance settings panel
-New cards added to gpu table.
-General cleaning...
-How2spell 'dimensions'?
 2010-10-01 00:35:39 -05:00
Beeks
bbbee73eae Updated multiple attachment code from Henri. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-09-30 14:03:18 -04:00
unknown
7b409eb7ab -Enabled multi-processor compiling with Visual Studio 
-Fixed refrences to secondlife-bin.exe in build scripts
-Added ability to blacklist sounds through Sound Explorer floater.
-Added a missing color to the silver skin
 2010-09-30 00:45:34 -05:00
Beeks
40af53fddc HI N3XI5 ILU 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-09-28 22:31:44 -04:00
Beeks
6ab2f45f99 Updates to the tag system to allow "status" tags to be on even if the client tags are off. Essentially split the Linden/Friend/EM/Muted system from the client tag options. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-09-28 17:46:00 -04:00