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

605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siana Gearz
c06db583a2 Henry's Media Fixes 2010-11-11 22:00:01 +01:00
Siana Gearz
5a49ceab6d Merge Shyotl 2010-11-11 21:54:47 +01:00
Siana Gearz
29584c7a28 HTTP GET fix, bisected from Techwolf's patches. Thanks :) 2010-11-11 14:53:50 +01:00
unknown
3604f98734 Forgot something, apparently! 
Also, Boolean + Real = bad.
 2010-11-11 00:26:17 -06:00
unknown
31cf29f51f Dear GCC: 
:(

Sincerely,
Shyotl
 2010-11-10 19:52:14 -06:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
Siana Gearz
8d6ce154fd Settings 2010-11-08 23:23:28 +01:00
Siana Gearz
d7a1575ad2 Merged Ascent progress - title picker 2010-11-08 22:59:46 +01:00
Siana Gearz
21e10551b3 More fixes after RLVa plonk 2010-11-07 21:33:31 +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
Siana Gearz
ae4a9521af Linden walk motion slower 2010-11-06 20:13:38 +01:00
Siana Gearz
9cb3da23ea Skin packaging fix 2010-11-05 16:30:48 +01:00
Beeks
4763ee7424 z.z 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-26 23:10:30 -04:00
Beeks
7eca5b9fcc Merge branch 'master' of github.com:Beeks/Ascent 
Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml
 2010-10-26 23:08:41 -04:00
Beeks
d3cb5edf2c HonK hOnk hoNK 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-26 23:05:08 -04:00
Beeks
55343314e1 ffffffffffub 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-26 23:04:04 -04:00
Beeks
b23d7f174c Forced to push completely broken Contact Groups because a comment was removed from ascentflowercontactgroups.cpp and was committed. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-26 23:01:51 -04:00
Beeks
395100fef6 Henri's Group Title picker. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-26 22:48:00 -04:00
CharleyLevenque
38374d3876 RP mode for IMs. Versioning. Dickdongs. 2010-10-24 01:14:00 -04:00
Beeks
2ca3f5c2fa A few tweaks for the Align tool. Disabled the control handles if you can't move the object. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-23 19:11:56 -04:00
unknown
f357842265 Variable high-res screenshot size + supersampling (non-deferred only) 2010-10-22 12:10:27 -05:00
Beeks
537e396882 Qarl's new Align tool. 
Signed-off-by: Beeks <HgDelirium@gmail.com>
 2010-10-22 02:40:40 -04:00
unknown
4929460c66 COA stuff rolled into gSavedSettings. 
Added common script<->client command junk.
 2010-10-19 18:50:47 -05:00
Siana Gearz
df20a1b1bb Revert "Crude attempt at backporting more recent animation engine from 2.x. Dont wanna walk like a duck" 
This reverts commit 49cb86adae.
 2010-10-18 23:24:49 +02:00
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
unknown
4e854ffd2b -Fixed idle timer which got fux'd in previous commit. 
-Afk now uses LLCachedControl
 2010-10-12 18:04:57 -05: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
unknown
3b0bfc40bc -LLCached[COA]Control can now be static const. Use for readonly access. 
-const'd all readonly LLCached[COA]Controls to prevent altering by mistake.
-added get() accessor to LLCached[COA]Controls to return cached type explicitly without manual casts.
-added missing operators to LLCachedCOAControl
-Converted a few more settings to LLCached[COA]Control
-Fixed LLColor4U -> LLSD -> LLColor4 problems in LLCachedControl

Ascent functionality fixes:
-Tag coloring pulled out of getClientInfo(Redundant. idleUpdateNameTag already handled it)
--Tag and color substituted at render-time. Simple boolean logic. Neglible perf penalty.
-Fixed llinfos spam if AscentShowSelfTagColor = false
-Client tag updated less superfluously
 2010-10-12 00:44:16 -05:00
unknown
25190a6d8a Merge remote branch 'Ascent/master' 
Conflicts:
	indra/llaudio/llaudioengine.cpp
	indra/llcommon/llqueuedthread.cpp
	indra/llimage/llimage.cpp
	indra/llimage/llimagepng.cpp
	indra/llimage/llimagepng.h
	indra/llimagej2coj/llimagej2coj.cpp
	indra/llrender/llimagegl.cpp
	indra/llrender/llrender.cpp
	indra/newview/ascentprefssys.cpp
	indra/newview/ascentprefsvan.cpp
	indra/newview/gpu_table.txt
	indra/newview/llfloaterauction.cpp
	indra/newview/llsavedsettingsglue.cpp
	indra/newview/llsavedsettingsglue.h
	indra/newview/llstartup.cpp
	indra/newview/llviewercontrol.cpp
	indra/newview/llviewercontrol.h
	indra/newview/llvoavatar.cpp
	indra/newview/pipeline.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
 2010-10-11 07:01:10 -05:00
Siana Gearz
fb89cb11d8 Fixes for that merge, making it build. 2010-10-11 12:59:25 +02:00
unknown
30aeb49013 Added some VS files to .gtignore 2010-10-11 04:53:08 -05:00
unknown
f46d8a767b -Moved LLCachedControl stuff to llxui/llcontrol.h to ease usage in other projects. 
-Fixed mistakes in LLCachedCOAControl revealed by GCC. Thanks Siana.
-LLCacheControl'd stuff related to postprocessing, which I may mess with later.

GCC... Sigh.
 2010-10-11 04:08:24 -05: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