Commit Graph

207 Commits

Author SHA1 Message Date
Siana Gearz
c06db583a2 Henry's Media Fixes 2010-11-11 22:00:01 +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
740b570168 Merged in RLVa. Viewer broken! 2010-11-07 05:05:47 +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
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
537e396882 Qarl's new Align tool.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-10-22 02:40:40 -04: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
8148416f42 Who wants to lag out? -.- 2010-10-14 13:08:38 +02:00
Siana Gearz
6c8080d1a6 Merge remote branch 'shyotl/master' 2010-10-11 03:53:52 +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
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
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
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
d36f86f674 Moved the Logout/Login and Teleport screen options to Vanity for future use, set them to "enable" instead of "disable" (This will make more sense in the future). This update also has the changes in the settings for the update to follow it (Status tags)
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-28 17:44:01 -04:00
Beeks
f8c2308c87 System Inventory beta - Working, but perhaps not as well as I'd like it to.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-24 20:06:33 -04:00
Beeks
ac96519df3 Fixes for mac compatibility. Big thanks to Katharine Berry for catching the issue.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-22 22:19:38 -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
72c4c63b95 Adjustments to IMs -
Got "Announce incoming IMs" working.
Group name can now be shown in the local chat notifications for IMs.
"IM Received" changes to "New IM" for length.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-21 14:53:36 -04: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
64abd1889f Hex Values in color picker, as well as general cleanup of the color picker.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-21 14:44:52 -04:00
Beeks
1c4148a9de UI tweaks to System preferences.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-19 15:53:30 -04:00
Beeks
615b4896d1 Finishing touches for Auto-Responses.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-19 00:22:23 -04:00
Beeks
d3631e552f UI updates to support Auto-Response messages. Reorganized a good section of the Chat/IM panel for organizations sake, as well.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-18 21:29:38 -04:00
Beeks
cf23a60c1a Changed the AO add and remove buttons so they follow our current conventions (+ and - instead of the check and X).
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-18 21:28:09 -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
871ada0121 Fixed the texture previewer so the window shows up right. Also added an "Alpha" tag on it that should let you know if a texture has alpha or not - Useful in some cases.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-17 19:57:51 -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
d49c92b6fe I got bored and put in the math functions from Imprudence.
We need something to show the list - Preferably a bit better than the popup that they use, I'm thinking maybe an expanding sidebar on the build menu?

Oh, minor changes - Texture repeats go up to 1000 now because it has numbers, and I tweaked the primitive params section so it doesn't fall off the window.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-16 22:08:33 -04:00
Beeks
7f0af74e00 Merge branch 'master' of github.com:Beeks/Ascent 2010-09-16 16:02:28 -04:00
Beeks
59d7c33954 Collection of theoretical improvements for ATI cards, as well as a couple memory leaks. Thanks to Shyotl for bringing them up and offering solutions.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-16 16:00:47 -04:00
Beeks
24f3101629 Tagteam Texture Editor Commit Night!
Update 1: Align Planar Textures.
Update 2: Copy/Paste buttons for texture params now work.

Sorry about another two-in-one patch, but y'can't really change one without the other on this.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-15 20:38:33 -04:00
CharleyLevenque
e5afa9b50f Fixing a build error related to debug output in contact groups code. 2010-09-15 03:29:40 -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
e703ee3152 Fix for tabbing order on Friends list, new features were confusing or changing the expected usage by regular users
Cleaned up the source file as well.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-14 22:38:02 -04:00
Beeks
87ac06a9a0 Merge branch 'master' of github.com:Beeks/Ascent
Conflicts:
	indra/newview/llpreviewgesture.cpp
2010-09-12 17:26:21 -04:00
CharleyLevenque
91c6ab94ac Compliance fixes 2010-09-12 17:06:40 -04:00