b48dad1726
DN-199 Modify LLGetDisplayName tooltip
2010-11-19 16:12:26 -08:00
61daa3133a
automated merge from viewer-development-shining
2010-11-18 13:23:01 -05:00
80364035a1
SH-410 Opaque Water Project version 2.0
...
Added opaque water default settings to Linux featuretable.
2010-11-18 11:14:57 -05:00
d76e0dd87f
merge fix for STORM-582
2010-11-17 21:02:57 -05:00
dc6e5371eb
Update slvoice dependencies to a hopefully correct version
2010-11-17 15:21:56 -08:00
ca1f392d88
merge up to latest viewer-development
2010-11-17 17:04:28 -05:00
3a36ed079c
Merge with viewer-development
2010-11-17 13:25:32 -08:00
cde71466ec
Merge with myself
2010-11-17 13:25:17 -08:00
2756030ae3
It is safe to use Python 2.7 on Windows, if present
2010-11-17 12:58:05 -08:00
4beeb6c03b
Update Linux slvoice dependency
2010-11-17 12:55:56 -08:00
d93df4720e
Update Mac slvoice dep
2010-11-17 12:52:57 -08:00
4ecf93fda2
merge fix for STORM-563
2010-11-17 15:23:01 -05:00
3b86582fb8
merge fix for STORM-588
2010-11-17 15:22:05 -05:00
f526f641d8
merge fix for STORM-589
2010-11-17 15:21:16 -05:00
f99ccb12df
Update slvoice dependency for Windows
2010-11-17 12:19:00 -08:00
289e1f3309
merge fix for STORM-590
2010-11-17 15:18:01 -05:00
81edfefcaf
STORM-582 ADDITIONAL_FIX Added missing button to Move&View preferences tab.
2010-11-17 22:10:37 +02:00
14b2b796ab
STORM-590 FIXED Add Preferences to enable the display of the Advanced and Development menus
...
- Added control_names for the "Show Advanced Menu" and "QAMode" checkboxes
2010-11-17 15:31:23 +02:00
7e9572fab5
STORM-589 FIXED Add a Preference that allows users to display the grid selection drop-down on the login screen
...
- Added a control_name for the "Show Grid Selection at login" checkbox
2010-11-17 15:21:58 +02:00
00ada8dccd
STORM-588 FIXED Add a Preference that allows users to run multiple Viewer instances
...
- Added a control_name for the "AllowMultipleViewers" checkbox
2010-11-17 15:09:08 +02:00
669d10a4ee
Merge with lindenlab/viewer-development
2010-11-16 15:59:39 -08:00
fb32d211ec
merging up to tip of viewer-development
2010-11-16 17:45:34 -05:00
d0de833d94
STORM-563 FIXED Updated all localized XUI strings and notifications templates to use display names.
...
Previously name substitutions were broken, so "[FIRST] [LAST]" was displayed instead of avatar name.
Some of the affected notifications:
* avatar went online/offline notification
* object return notification
* calling card offer
* script dialog
* auto-unmute notification.
See the diff for more details.
The fixes apply to all locales but English (which is already correct).
Besides, I fixed calling card offer notification to display avatar name correctly. It was broken even in English.
2010-11-16 23:26:08 +02:00
0670e889f9
Replace template verification code with an md5sum check.
2010-11-16 12:15:00 -08:00
eb2bd41033
merge fix for STORM-544
2010-11-16 14:59:52 -05:00
ea864ac259
merge fix for STORM-580
2010-11-16 14:52:13 -05:00
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
ed9af1151f
Merge with lindenlab/viewer-development
2010-11-15 14:14:00 -08:00
128ec0ceaa
STORM-580 FIXED Removed "IM" font color setting as unused.
2010-11-15 23:01:17 +02:00
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
a9eb639511
Automated merge with https://bitbucket.org/vadim_productengine/storm-52
2010-11-15 07:34:30 -05:00
e08250d087
merge fix for STORM-578
2010-11-15 07:28:47 -05:00
0cd40b4409
merge fix for STORM-579
2010-11-15 07:27:50 -05:00
5cbbb565f1
Merge simon_linden/viewer-dev to get avatar motion prediction code.
2010-11-12 16:59:43 -08:00
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
187b21e6d2
Merge latest from lindenlab/viewer-development
2010-11-12 12:24:15 -08:00
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
4839e79b20
merge STORM-102 to latest viewer-development prior to pull
2010-11-12 14:15:21 -05:00
5b86f60a13
Automated merge with file:///Users/oz/Work/viewer-development
2010-11-12 14:06:22 -05:00
4dcf8288be
Propagated 2.3.0 Beta 3 tag from viewer-beta
2010-11-12 10:07:53 -08:00
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
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
5711bb02ed
Merge
2010-11-12 16:49:57 +02:00
2632565bbc
STORM-102 : STORM-143 :Removed unneeded code in llimview.
2010-11-12 09:09:41 -05:00
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
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
899f470dec
STORM-102: Merge from viewer-development
2010-11-11 22:37:51 -05:00
5f099265fc
Merge
2010-11-11 15:54:06 -08:00
76d708bdb5
Turning down dummy avatar name entry expiration to 2 minutes
2010-11-11 15:53:13 -08:00
c13f6afe73
Added tag 2.3.0-beta3 for changeset 6ad3d6fa35a4
2010-11-11 13:13:08 -08:00
Leyla Farazha