Arrehn
3bd561e4f3
First pass at removing patronizing "My ...." from UI elements, as well as changing SL-specific elements to something that would work on other grids as well.
2010-11-17 19:13:17 -05:00
Arrehn
381762f037
Merge from int
...
Robustness improvements to mac build
2010-11-17 18:40:43 -05:00
Arrehn
b1e83df9ba
Branch merge
2010-11-17 10:39:47 -08:00
Arrehn
d7215a1497
linux update (need to update linux build code)
2010-11-17 10:36:20 -08:00
Arrehn
5cfc22c3c8
Merge from ll snowstorm
2010-11-17 10:34:44 -08:00
Arrehn
bb04abd971
RLVa mergeup
2010-11-17 06:19:05 -08:00
Oz Linden
fb32d211ec
merging up to tip of viewer-development
2010-11-16 17:45:34 -05:00
Christian Goetze (CG)
0670e889f9
Replace template verification code with an md5sum check.
2010-11-16 12:15:00 -08:00
Oz Linden
eb2bd41033
merge fix for STORM-544
2010-11-16 14:59:52 -05:00
Oz Linden
ea864ac259
merge fix for STORM-580
2010-11-16 14:52:13 -05:00
Arrehn
ebe5623252
merge
2010-11-16 13:50:38 -05:00
Arrehn
b5f92ea6b9
Changes for more compatible windows builds
2010-11-16 13:50:05 -05:00
Wolfpup Lowenhar
10998b137e
STORM-535 : STORM-544 : Addition of Floater Opacity controls to pannel_prefferences_color.xml
...
after loss during cleanup of preferences.
2010-11-16 13:33:56 -05:00
Seth ProductEngine
128ec0ceaa
STORM-580 FIXED Removed "IM" font color setting as unused.
2010-11-15 23:01:17 +02:00
Vadim ProductEngine
e8e1d7e629
STORM-318 FIXED The Advanced menu shortcut was broken under Linux.
...
Reason: The old shortcut (Ctrl+Alt+D) was eaten by some window managers.
Changes:
- Changed the shortcut to Ctrl+Alt+Shift+D.
- Moved the appropriate menu item from "Advanced > Shortcuts" to "World > Show"
(so that it's not in the menu it triggers) and made it visible.
The old shortcut is still available but marked as legacy.
Submitting on behalf of Boroondas Gupte.
2010-11-15 21:38:12 +02:00
Oz Linden
a9eb639511
Automated merge with https://bitbucket.org/vadim_productengine/storm-52
2010-11-15 07:34:30 -05:00
Oz Linden
e08250d087
merge fix for STORM-578
2010-11-15 07:28:47 -05:00
Oz Linden
0cd40b4409
merge fix for STORM-579
2010-11-15 07:27:50 -05:00
Arrehn
61f73d816d
Fixing unescaped XML
2010-11-15 03:19:57 -05:00
Arrehn
fa9ae84641
Saner default settings
...
- make more familiar to v1, power users
2010-11-15 02:43:47 -05:00
Arrehn
d615b0535e
Dont' send crash reports, ever. We're not set up to receive them yet anyway
2010-11-15 01:25:04 -05:00
Arrehn
18b48b59e3
Allow high-graphics defaults to use more texture memory. Assume user knows what they are doing. Lower-graphics defaults will resort to original behavior.
2010-11-15 01:21:59 -05:00
Arrehn
0322fed19e
Non-Patronizing Menus, Part 1
2010-11-14 23:25:50 -05:00
Arrehn
e4245ffbbe
Change "developer" default build channel to "private"
2010-11-14 23:24:30 -05:00
Arrehn
9e674938a8
Changing my video card to use more of its detected memory
2010-11-13 13:47:08 -05:00
Arrehn
aeaf4c5651
Updated macosx build control for channels
2010-11-13 13:46:32 -05:00
Arrehn
dec84f90fa
Added much more build control options, including channel and buildtype
2010-11-13 13:05:56 -05:00
Dave SIMmONs
5cbbb565f1
Merge simon_linden/viewer-dev to get avatar motion prediction code.
2010-11-12 16:59:43 -08:00
Vadim ProductEngine
b2fcba25c8
STORM-52 FIXED Made it possible to use an external script editor.
...
The editor can be specified:
* via "ExternalEditor" setting in settings.xml
* via LL_SCRIPT_EDITOR variable
Removed obsolete XUIEditor setting in favor of the new one.
2010-11-13 00:53:29 +02:00
Dave SIMmONs
187b21e6d2
Merge latest from lindenlab/viewer-development
2010-11-12 12:24:15 -08:00
Dave SIMmONs
e3677f9ee2
Revert change for ER-301 to make merging easier. We'll get this in another pass
2010-11-12 12:18:18 -08:00
Oz Linden
4839e79b20
merge STORM-102 to latest viewer-development prior to pull
2010-11-12 14:15:21 -05:00
Oz Linden
5b86f60a13
Automated merge with file:///Users/oz/Work/viewer-development
2010-11-12 14:06:22 -05:00
Arrehn
09dcf64f8e
Syntax error in win32 build file (thanks tozh)
2010-11-12 13:17:04 -05:00
Tonya Souther
c90ad71f08
Not rebuilding package if only --configure is specified on OS X.
2010-11-12 12:15:27 -06:00
Tonya Souther
3ee9858495
Build number change for Windows.
2010-11-12 12:13:13 -06:00
Dessie Linden
4dcf8288be
Propagated 2.3.0 Beta 3 tag from viewer-beta
2010-11-12 10:07:53 -08:00
Andrew Productengine
29a36c21db
STORM-571 FIXED Moved voice prefs from advanced to Sound&Media and changed layout accordingly.
...
This changeset also covers STORM-572 (note that design in this fix differs a little from the one proposed in there because there was not enough space to make it that way).
2010-11-12 18:18:44 +02:00
Tonya Souther
aa279c2872
Build number change for Linux.
2010-11-12 09:41:17 -06:00
Tonya Souther
743b34a70a
Changing build number to Mercurial revision number in OS X build. Dunno how it's done on Windows; will do Linux script momentarily.
2010-11-12 09:31:44 -06:00
Seth ProductEngine
ef46e7037c
STORM-579 FIXED resident SLURL font color to match Chat preferences for plain text Nearby Chat log
2010-11-12 17:28:44 +02:00
Paul Guslisty
5711bb02ed
Merge
2010-11-12 16:49:57 +02:00
Wolfpup Lowenhar
2632565bbc
STORM-102 : STORM-143 :Removed unneeded code in llimview.
2010-11-12 09:09:41 -05:00
Paul Guslisty
5c18ab7ace
STORM-587 ADDITIONAL FIX Layout cleanup in the Advanced tab of Preferences
...
- Removed controls:
1. "Move avatar lips when speaking" checkbox
2. "Toggle speak on/off when I press:" checkbox
3. "Push-to-Speak trigger" lineeditor
4. "set_voice_hotkey_button" button
5. "set_voice_middlemouse_button" button
- Set proper names for checkboxes
According to the specification these controls are in the Sound&Media panel now.
2010-11-12 15:35:42 +02:00
Arrehn
ade1d64c70
merge
2010-11-12 00:55:49 -05:00
Arrehn
bacbeeef82
Branding: Mac icons + login page
2010-11-12 00:55:20 -05:00
Arrehn
1a808d79a2
Merge from firestorm-int
2010-11-12 00:54:39 -05:00
Arrehn
fc6c9fe82c
More windows build instructions
2010-11-12 00:10:30 -05:00
Arrehn
716d447eb2
Clarification on TPVP
2010-11-11 23:34:22 -05:00
Wolfpup Lowenhar
4077e6bb52
STORM-102 : STORM-143 :Made needed changes to code to improve searching for previous logs
...
and also changed the name used for P2P IM log file names. The latter change is going to
temporarely break personal content for those that are saving conversation logs as P2P IM
logs will now be useinf the user name and not the legacy name.
2010-11-11 22:50:14 -05:00