summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-11-15Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-15Automated merge with https://bitbucket.org/vadim_productengine/storm-52Oz Linden
2010-11-15merge fix for STORM-578Oz Linden
2010-11-15merge fix for STORM-579Oz Linden
2010-11-12Merge simon_linden/viewer-dev to get avatar motion prediction code.Dave SIMmONs
2010-11-13STORM-52 FIXED Made it possible to use an external script editor.Vadim ProductEngine
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-12Merge latest from lindenlab/viewer-developmentDave SIMmONs
2010-11-12Revert change for ER-301 to make merging easier. We'll get this in another passDave SIMmONs
2010-11-12merge STORM-102 to latest viewer-development prior to pullOz Linden
2010-11-12STORM-571 FIXED Moved voice prefs from advanced to Sound&Media and changed ↵Andrew Productengine
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-12STORM-579 FIXED resident SLURL font color to match Chat preferences for ↵Seth ProductEngine
plain text Nearby Chat log
2010-11-12MergePaul Guslisty
2010-11-12STORM-102 : STORM-143 :Removed unneeded code in llimview.Wolfpup Lowenhar
2010-11-12STORM-587 ADDITIONAL FIX Layout cleanup in the Advanced tab of PreferencesPaul Guslisty
- 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-11STORM-102 : STORM-143 :Made needed changes to code to improve searching for ↵Wolfpup Lowenhar
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-11STORM-102: Merge from viewer-developmentWolfpup Lowenhar
2010-11-11STORM-587 ADDITIONAL FIX Layout cleanup in the Advanced tab of PreferencesPaul Guslisty
- 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-11STORM-587 FIXED Layout cleanup in the Advanced tab of PreferencesPaul Guslisty
- 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-11merge performance data tracking system STORM-104Oz Linden
2010-11-11merge fix for STORM-559Oz Linden
2010-11-11STORM-583 ADDITIONAL_FIX Fixed top_pad of topmost control in "Colors" so ↵Andrew Productengine
that it is consistent with other preferences tab.
2010-11-11STORM-586 FIXED Layout cleanup in the Setup tab of PreferencesPaul Guslisty
- Deleted Mouselook settings - Increased vertical padding between "Cache size" and "Cache location" controls
2010-11-11STORM-582 FIXED Moved movement and camera control preferences from Advanced ↵Andrew Productengine
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-11STORM-585 FIXED Layout cleanup in the Privacy tab in PreferencesPaul Guslisty
- 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-11STORM-570 ADDITIONAL FIX Layout cleanup in the General tab of PreferencesPaul Guslisty
- 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-10ER-301 : increase allowable bandwidth. Bumped up to 3 mbps.Dave SIMmONs
2010-11-10fixing group invite name scrubbing to work with server changesLeyla Farazha
2010-11-10DN-203 [crashhunters] LLIMModel::LLIMSession::onAvatarNameCachLeyla Farazha
2010-11-10Merge Backout rev 994c6639b393 DN-132 top scripts change - it was breaking ↵Leyla Farazha
name filtering
2010-11-10Backed out changeset: 994c6639b393Leyla Farazha
2010-11-11STORM-578 FIXED SLURL to object or user name in nearby chat toast now uses ↵Seth ProductEngine
the font color selected in Preferences->Chat. Removed unused "ChatToastAgentNameColor" setting from colors.xml.
2010-11-10STORM-575 FIXED Layout cleanup in the Chat tab of PreferencesPaul Guslisty
- Deleted color swatchers - Repositioned rest controls according to the specification
2010-11-10STORM-583 ADDITIONAL_FIX Added missing "URLs" label to "Colors" tab.Andrew Productengine
2010-11-10STORM-583 FIXED Moved colors-related preferences to the new Colors tab.Andrew Productengine
- 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-10STORM-570 FIXED Layout cleanup in the General tab of PreferencesPaul Guslisty
- 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-10STORM-592 FIXED Added xml attribute that allows to customize color swatch ↵Andrew Productengine
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-10STORM-572 FIXED Move "Bubble Chat" preference from Advanced to ChatPaul Guslisty
- Moved checkbox "Bubble Chat" from Advanced to Chat panel of Preferences floater
2010-11-10STORM-566 FIXED Added new tabs to preferences floater.Andrew Productengine
Their panels are currently empty and will be filled in later tasks.
2010-11-09merge fixes for STORM-546Oz Linden
2010-11-09Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-11-09Merge down from betaKent Quirk
2010-11-09Merge notifications prefs fixKent Quirk
2010-11-09merge fix for STORM-577Oz Linden
2010-11-09merge fix for STORM-535Oz Linden
2010-11-09Merge from betaKent Quirk
2010-11-09merge storm-102 branch back to defaultOz Linden
2010-11-09SH-412 -- fix the way that redraws happen to eliminate flickering on resize ↵Kent Quirk
-- patch from davep and seraph, I'm just applying it.
2010-11-09STORM-569 FIXED Add a Preference to enable Viewer UI HintsPaul Guslisty
- Added checkbox to the floater Preferences->panel General to Enable\Disable UI Hints
2010-11-09STORM-535 FIXED PLEASE allow adjustable transparency of "Nearby Chat" ↵Paul Guslisty
window, Chat History and Chat "Toasts" in Viewer 2.0! - Added to the settings.xml values of transparency for active and inactive floaters - Added three members to the LLFloater. These members store current transparency of floater, transparency of active and inactive floaters. - Added callbacks that update transparency value of active and inactive floater. Also in these callbacks value of current floater transparency updated. - In panel preferences advanced added two spinners: transparency of active floaters and inactive ones. See screenshot.
2010-11-09merge up from v-dTofu Buzzard