Commit Graph

80 Commits

Author SHA1 Message Date
Siana Gearz
f9dcb1bb09 RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF 2010-11-25 23:47:11 +01:00
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
Siana Gearz
6866a36a5c Display names from Phoenix. Thanks Wolfspirit!
That's quite a piece of work. I have NO idea how Jess can downplay the
effort that went into this.

And it's still not complete, local chat is not affected, perhaps group
chat too.
2010-11-20 15:25:57 +01:00
Siana Gearz
c21d066454 Auto deruth, backport from 2.x 2010-11-19 12:41:08 +01:00
Siana Gearz
d5fee73c42 Thickbrick's fixes 2010-11-18 20:22:11 +01:00
Siana Gearz
a6f6325d37 Deferred instantiation and lazy avatar updates...
Are a can of worms. This will haunt me for a while i think.
2010-11-16 00:43:44 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
9dffb18c25 ld.gold on linux, useless spam 2010-11-13 04:45:10 +01:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00
Siana Gearz
d7a1575ad2 Merged Ascent progress - title picker 2010-11-08 22:59:46 +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
d3cb5edf2c HonK hOnk hoNK
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-26 23:05:08 -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
f079cf07ae Puh some fixes mostly to ripout 2010-10-18 22:39:19 +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
babc0dc420 Snowgobe 1.4.2 to 1.5.0 patch part 1 (no rejects) 2010-10-18 10:25:32 +02: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
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
Siana Gearz
6c8080d1a6 Merge remote branch 'shyotl/master' 2010-10-11 03:53:52 +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
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
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
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
Beeks
79412de233 Serious fix for the Tintable tattoos!
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-27 00:20:34 -04:00
Beeks
4cace48a9b Fixes for tattoo tinting - With any luck this will reduce the number of ruths.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-26 14:24:34 -04:00
Beeks
a101b166ac A bunch of minor formatting tweaks not worth a separate commit for.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-24 20:24:05 -04:00
Beeks
ec55705bdd THE BIGGIE.
Holy hell, this was an interesting one to implement. I wish I understood it better. Unfortunately I think this marks the end of trying to re-implement the Local Inventory for Temp and Local textures. It's just not feasible now that the entire inventory system has been whipped into a code shitstorm.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-22 06:48:48 -04:00
Beeks
ae03b4c58b Updated the code to allow people to control whether to get client definition updates, now that the updater works.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-18 21:23:15 -04:00
Beeks
ed942cfe74 Tintable tattoo layers - Another Shyotl patch.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-17 19:10:10 -04:00
Beeks
b215b405ea Two updates that sort of went in tandem.
Updated the Client tag options so that you can turn off tags/colors for others.

However, in the process of doing this the need for Client-Or-Account setting control became increasingly needed, and so a complete rebuild of some sections fetching values were redone across files. The good news is that we now have getCOA* settings for various settings types - Color4, Strings, U/F/S32, and BOOLs. Just include llsavedsettingsglue.h

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-15 00:22:06 -04:00
Beeks
1da8076a64 Actual fix for the AO stop stuff. AO is still not up to par, but it's getting there.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-12 20:27:18 -04:00
Beeks
974fbb1a29 Animation stop seems to explode. Like, badly. Commented out until a fix can be found.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-12 19:41:20 -04:00
Beeks
441cb4bbb4 Crazy, super-hack AO replacement. It's actually pretty good, but requires a lot of tweaks and fixes. Need to talk to the creator of the original code to see if they can shed light on stuff.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-12 05:03:25 -04:00
Beeks
f0fc284994 Client Definitions update
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-10 19:59:39 -04:00
Beeks
26af7e436c WLF panel - Fixed.
Colors updating when Friends option is turned on/off - Fixed.
Client tag definitions can now theoretically be retrieved from "http://ascent.balseraph.org/updates/client_definitions.xml"

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-04 18:44:02 -04:00
Beeks
a104e23fdb Removed some TOS/TPVp violations that we missed in the last sweep
Fix for the client definitions - Emerald's color is corrected, Emergence now reports properly.
Fixed the error "Client crashes if preferences is opened on login screen"

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-04 16:18:24 -04:00
Beeks
fa0143f917 New color tag system is basically in, but commented out. Color works, but takes a while to update for the user.
Couple of minor bugfixes with color settings - We need to finish the color settings that we have planned and soon, since one of a set of four got pushed in without the matching set.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-03 16:38:05 -04:00
CharleyLevenque
4b6d1ab019 Fixes to new tag system 2010-09-03 05:42:08 -04:00
Beeks
77e268c79a Sometimes you just like to commit stuff and watch the colors. It's so beautiful. Life is beautiful.
Attempted fix on the wlf panel again. Prognosis: Fuck this shit.

aside from that, a couple fixes to other bits and pieces.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-03 05:18:18 -04:00
Beeks
fed6bb2c8a Merge branch 'master' of github.com:Beeks/Ascent
Conflicts:
	indra/newview/llvoavatar.cpp
2010-09-03 03:23:01 -04:00
Beeks
4650ca453c Removed the OTR button - Probably not going to bother with OTR.
Added some code for a later feature in llagent and llvoavatar.
Performed a minor tweak to the client tag code that was incorrect.
Removed Emerald's color options in the tag dropdown in accordance of them theoretically being removed tomorrow.
2010-09-03 03:13:42 -04:00
CharleyLevenque
b3e955cc28 Package builder fixes, show friends with custom tag/color. 2010-09-03 02:46:20 -04:00
Beeks
d9cf8144e4 Client definitions were mucked with to poke Emerald.
People complained about the color of Friends in the avatar list, so I started adding support to change that (And made it account-specific as all the color stuff is designed to be). Didn't finish it, though.
The windlight popup is still broke as fuck when you start up, opening and closing it fixes it but no amount of basic common sense fixes it.
Changes to the client definitions to try to add our own colors worked, but the definitions file fucked off in the process so the client ID thing is sort of broken. Rather than trying to fix it, I think we'll just move onto the method described by Hazim/Zwagoth, which was closer to what we'd been trying to develop. I propose we just make people show up as Ascent and remove the tag reporting, honestly.
2010-09-02 22:10:56 -04:00
Beeks
1fe07cfcd7 Fixes, foxes, faxes, and "oh fucks."
Link and unlink buttons are now in the build menu. To facilitate this, some minor elements were adjusted, and the edit boxes were re-aligned. Emerald's layout was pretty sloppy anyway.
More fiddling with the windlight menu, and more dead ends.

Expect at least one more update before night's end to implement the features coming in from the merge.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-02 03:19:13 -04:00
Beeks
f0cb6acf40 Breast physics is more fully implemented - Default values may be too subtle for some users, look for them in the Vanity preferences.
Client Tags are corrected, it was using the wrong value after being set.
Show LookAt now has a checkbox option in the Security tab for people who don't want to use the Advanced menu.
Logout/Teleport screen options are now controlled.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-08-29 23:51:20 -04:00