Commit Graph

13497 Commits (fb32d211ec22bb9170fa14cb7d0ef9249bae2b7d)

Author SHA1 Message Date
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
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
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
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
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
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
Wolfpup Lowenhar 899f470dec STORM-102: Merge from viewer-development 2010-11-11 22:37:51 -05:00
Leyla Farazha 5f099265fc Merge 2010-11-11 15:54:06 -08:00
Leyla Farazha 76d708bdb5 Turning down dummy avatar name entry expiration to 2 minutes 2010-11-11 15:53:13 -08:00
Dessie Linden c13f6afe73 Added tag 2.3.0-beta3 for changeset 6ad3d6fa35a4 2010-11-11 13:13:08 -08:00
Paul Guslisty 2287f7612c STORM-587 ADDITIONAL FIX Layout cleanup in the Advanced tab of Preferences
- Temporary restored 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

They should be moved to the Sound&Media panel of floater Preferences. But the specification for the Sound&Media panel is not ready yet.
As specification will be ready, these controls will be moved to the Sound&Media panel.
2010-11-11 18:49:55 +02:00
Paul Guslisty 51e38dff76 STORM-587 FIXED Layout cleanup in the Advanced tab of Preferences
- According to the specification deleted all controls except:
    1. "UI Size" slider
    2. "Show script errors in" radio group

- According to the specification:
    1. "Allow Multiple Viewer" checkbox
    2. "Show Grid Selection at login" checkbox
    3. "Show Advanced Manu" checkbox
    4. "Show Developer Menu" checkbox
2010-11-11 16:45:35 +02:00
Oz Linden 20921d6a1a merge performance data tracking system STORM-104 2010-11-11 09:29:30 -05:00
Oz Linden fc22e2cf5b merge fix for STORM-559 2010-11-11 09:22:56 -05:00
Andrew Productengine 5821631c2e STORM-583 ADDITIONAL_FIX Fixed top_pad of topmost control in "Colors" so that it is consistent with other preferences tab. 2010-11-11 15:15:04 +02:00
Paul Guslisty d358feff7a STORM-586 FIXED Layout cleanup in the Setup tab of Preferences
- Deleted Mouselook settings

- Increased vertical padding between "Cache size" and "Cache location" controls
2010-11-11 15:06:51 +02:00
Andrew Productengine 5894a6a593 STORM-582 FIXED Moved movement and camera control preferences from Advanced to the new Move & View tab.
In addition to moving existing controls, created stub checkbox and radiobuttons for double-click behavior. Logic will be hooked up to them in STORM-576.
2010-11-11 14:59:51 +02:00
Paul Guslisty 608d58c114 STORM-585 FIXED Layout cleanup in the Privacy tab in Preferences
- Increased vertical paddings between checkbox groups

- Changed label of IM checkbox group from "Logs:" to "Chat Logs:"

- Changed label of checkbox from "Add timestamp" to "Add timestamp to each line in chat log"

- Added checkbox "Add datestamp to log file name". For now this checkbox is not working, it's just a stub for a future functionality.

- Added descriptive text for the "Block List" button
2010-11-11 14:51:05 +02:00
Paul Guslisty fd145f10b2 STORM-570 ADDITIONAL FIX Layout cleanup in the General tab of Preferences
- Decreased vertical padding between controls to insert radio group

- Added "Pressing letter keys:" radio group.

For now these radio buttons are not working, they are just a stub for a future functionality.
2010-11-11 13:59:03 +02:00
Dave SIMmONs 94680419e9 ER-301 : increase allowable bandwidth. Bumped up to 3 mbps. 2010-11-10 18:14:42 -08:00
Leyla Farazha ee8df37544 fixing group invite name scrubbing to work with server changes 2010-11-10 15:22:49 -08:00
Leyla Farazha 210c0f28e9 DN-203 [crashhunters] LLIMModel::LLIMSession::onAvatarNameCach 2010-11-10 15:21:09 -08:00
Leyla Farazha e06472ff40 Merge Backout rev 994c6639b393 DN-132 top scripts change - it was breaking name filtering 2010-11-10 14:45:54 -08:00
Leyla Farazha 32704455db Backed out changeset: 994c6639b393 2010-11-10 14:44:29 -08:00
Seth ProductEngine b7afbcbc97 STORM-578 FIXED SLURL to object or user name in nearby chat toast now uses the font color selected in Preferences->Chat.
Removed unused "ChatToastAgentNameColor" setting from colors.xml.
2010-11-11 00:17:59 +02:00
Richard Linden d7bca2b7b1 EXP-428 FIXED Display of llDialog and some other dialogs that should not be suppressable is broken 2010-11-10 11:38:55 -08:00
Paul Guslisty e2008b3669 STORM-575 FIXED Layout cleanup in the Chat tab of Preferences
- Deleted color swatchers

- Repositioned rest controls according to the specification
2010-11-10 20:17:31 +02:00
Andrew Productengine c65a221a6d STORM-583 ADDITIONAL_FIX Added missing "URLs" label to "Colors" tab. 2010-11-10 19:50:58 +02:00
Andrew Productengine c6062e05e6 STORM-583 FIXED Moved colors-related preferences to the new Colors tab.
- Copied "My effects" from General.
- Copied "Font colors" from Chat.
- Copied "Bubble Chat" color and opacity slider from Advanced.
- Fixed color swatches moved to this tab using attribute introduced in STORM-592 fix. Now only colored area is clickable.

Controls weren't removed from places they were before- it will be (or already was) done in "layout cleanup" subtasks of STORM-31.
2010-11-10 19:35:35 +02:00
Paul Guslisty 3138b5de86 STORM-570 FIXED Layout cleanup in the General tab of Preferences
- Adjusted vertical padding between all controls

- Set position and order of checkboxes between "Name tags" radio group and "Away timeout" checkbox according to the specification

- Deleted "My effects" color swatch
2010-11-10 18:23:33 +02:00
Andrew Productengine 79ba890f0c STORM-592 FIXED Added xml attribute that allows to customize color swatch label height.
This height was uncustomizable even by explicitly changing height of textbox in xml (i.e. writing caption_text.height = "value"), because it anyway received hardcoded value in LLColorSwatchCtrl's constructor.

- Added new label_height optional attribute to color swatch and used it in code.

P.S. Removing unused space in all color swatches in viewer should be done in some separate issue.
2010-11-10 17:55:57 +02:00
Paul Guslisty 2e7779e66c STORM-572 FIXED Move "Bubble Chat" preference from Advanced to Chat
- Moved checkbox "Bubble Chat" from Advanced to Chat panel of Preferences floater
2010-11-10 16:23:26 +02:00
Andrew Productengine d99ce25401 STORM-566 FIXED Added new tabs to preferences floater.
Their panels are currently empty and will be filled in later tasks.
2010-11-10 13:37:31 +02:00