summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-18Fix for mac build error.brad kittenbrink
2010-11-18CT-633 WIP FR linguisticeli_linden
2010-11-18First draft of CHOP-106 downloaded update ready notification.brad kittenbrink
Reviewed by mani.
2010-11-18automated merge from viewer-development-shiningLoren Shih
2010-11-18SH-410 Opaque Water Project version 2.0Loren Shih
Added opaque water default settings to Linux featuretable.
2010-11-17merge fix for STORM-582Oz Linden
2010-11-17Work on CHOP-135: Hooking up setting UpdaterServiceActive to functionality. ↵brad kittenbrink
Paired with Mani. Toggling the setting now calls LLUpdaterService::startChecking() and LLUpdaterService::stopChecking(), which enable and disable the service.
2010-11-17CHOP-135 Added Pref UI to Setup panel. Rev. by BradMark Palange (Mani)
2010-11-17CHOP-203 Fixed linux release bug - exclude update_install from symbol strippageMark Palange (Mani)
2010-11-17merge fix for STORM-563Oz Linden
2010-11-17merge fix for STORM-588Oz Linden
2010-11-17merge fix for STORM-589Oz Linden
2010-11-17merge fix for STORM-590Oz Linden
2010-11-17STORM-582 ADDITIONAL_FIX Added missing button to Move&View preferences tab.Andrew Productengine
2010-11-17STORM-590 FIXED Add Preferences to enable the display of the Advanced and ↵Paul Guslisty
Development menus - Added control_names for the "Show Advanced Menu" and "QAMode" checkboxes
2010-11-17STORM-589 FIXED Add a Preference that allows users to display the grid ↵Paul Guslisty
selection drop-down on the login screen - Added a control_name for the "Show Grid Selection at login" checkbox
2010-11-17STORM-588 FIXED Add a Preference that allows users to run multiple Viewer ↵Paul Guslisty
instances - Added a control_name for the "AllowMultipleViewers" checkbox
2010-11-16CHOP-179 Linux install uses linux-updater. Rev. by AlainMark Palange (Mani)
2010-11-16Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-16STORM-563 FIXED Updated all localized XUI strings and notifications ↵Vadim ProductEngine
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-16merge fix for STORM-544Oz Linden
2010-11-16merge fix for STORM-580Oz Linden
2010-11-16STORM-535 : STORM-544 : Addition of Floater Opacity controls to ↵Wolfpup Lowenhar
pannel_prefferences_color.xml after loss during cleanup of preferences.
2010-11-15Merge with lindenlab/viewer-developmentKyle Ambroff
2010-11-15STORM-580 FIXED Removed "IM" font color setting as unused.Seth ProductEngine
2010-11-15STORM-318 FIXED The Advanced menu shortcut was broken under Linux.Vadim ProductEngine
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-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-11CHOP-178 Add a non-interactive moe to the windows installer. Rev by BradMark Palange (Mani)
2010-11-11fix termination issues with thread safe queue in main loop repeater service.Andrew A. de Laix
2010-11-11Add very basic windows install script.Andrew A. de Laix
2010-11-11run install script on successful downloadAndrew A. de Laix
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