Commit Graph

222 Commits

Author SHA1 Message Date
siana
03feb0d74d No more focus fighting between vivox and alerts 2011-01-14 01:02:46 +01:00
Siana Gearz
6c37a5c514 This might just fix the double inventory thing 2011-01-13 02:56:31 +01:00
Siana Gearz
26a8ffb536 Map rotation setting on right click, from Imprudence. 2011-01-08 23:01:30 +01:00
Siana Gearz
7805feb08f Now we're Vivox license compliant 2011-01-07 17:07:00 +01:00
siana
d65a5ffeb7 Assorted DN and RLVa fixes from Phoenix 2011-01-02 02:05:32 +01:00
siana
3f1412e927 Partner Display Name 2010-12-28 05:15:25 +01:00
Siana Gearz
9983d0b803 Display Name work 2010-12-13 00:31:01 +01:00
Siana Gearz
e1b9109bee I hate being unsat when pressing ESC 2010-11-29 00:23:02 +01:00
Siana Gearz
f9dcb1bb09 RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF 2010-11-25 23:47:11 +01:00
Siana Gearz
f0e723c9a9 Prefs UI cleanup 2010-11-21 18:01:17 +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
f2d43d5239 Settings, UI fix 2010-11-15 11:46:00 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
6a7c9250fd Branding pt1 2010-11-14 17:28:44 +01:00
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