summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
indra/newview/llinventorybridge.cpp LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
2010-05-25MergeCallum Prentice
2010-05-25MergeCallum Prentice
2010-05-25automated mergeLoren Shih
2010-05-25EXT-7480 Add debuga bility to set texture discard levelsLoren Shih
Added TextureDiscardLevel override for specifying texture discard levels. Aesthetic change to add debug- flag to all avatar debug reporting metrics.
2010-05-25mergeRichard Linden
2010-05-21Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-21More for EXT-7309: Investigate turning RenderAvatarMaxVisible down to 1 or 2 ↵Xiaohong Bao
on low end hardware. set RenderAvatarMaxVisible to be 3 by default for low-end settings.
2010-05-20tweaked media attenuation to better match object sound attenuationRichard Linden
2010-05-20EXT-7223 FIXED (Add \"Shop\" Button in bottom of Inventory panel)Andrew Polunin
- Added 'MarketplaceURL' setting in settings.xml to represent URL which points to the Marketplace. - Added member mShopBtn in the class LLSidepanelInventory. - Added handler LLSidepanelInventory::onShopButtonClicked() which handles a click on the 'Shop' button - Added corresponding widget in the sidepanel_inventory.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/408/ --HG-- branch : product-engine
2010-05-25Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-05-25EXT-6685 FIXED Enabled by default option of logging script errors into ↵Alexei Arabadji
separate window. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/429/ --HG-- branch : product-engine
2010-05-20Manual merge from default branch.Vadim Savchuk
Auto-resolved conflicts in: - indra/newview/llpaneleditwearable.cpp - indra/newview/llviewermenu.cpp - indra/newview/llviewerwindow.cpp - indra/newview/skins/default/xui/en/notifications.xml --HG-- branch : product-engine
2010-05-20merge from PE's viewer-trunkTofu Linden
2010-05-19EXT-7104 WIP Implemented reaction on Sidebar button clickMike Antipov
Implementation details: * Added new setting SidebarWithButtonsVisibility * Sidebar bottom tray button changes its value on click (toggle state - value is TRUE) * SideTray listens changes of this setting's value and change its and its buttons visibility * expand/collapse Sidebar state is stored between changes of the setting. Reviewed by Yuri Chebotarev at https://codereview.productengine.com/secondlife/r/403/ --HG-- branch : product-engine
2010-05-19EXT-7104 WIP Implemented a functionality to control the width of the chat ↵Mike Antipov
entry field. * LLResizeBar calls notifyParent on resizing before changing rect of view, bottomtray processed this notification to update other buttons. * Had to move setup of buttons visibility on startup into LLBottomTray to ensure all buttons have necessary visibility BEFORE restore the width of the chat entry field; * Updated layout between chatbar and speak button to show resize mouse pointer in the middle between them. Implemented behavior: visible buttons shrink to their minimal width when the chat entry field gets wider. Also were refactored: * moved declaration of settings related to buttons visibility from the settings.xml to LLBottomTray. * moved setting of control listeners to LLBottomTray. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/403/ --HG-- branch : product-engine
2010-05-19Add digicert high assurence CARoxie Linden
2010-05-19automated mergeRoxie Linden
2010-05-14EXT-7221 FIXED Now the 'Get More >>' link exists exactly before the 'View ↵Andrew Polunin
All >>' link in the Gestures list - Added new setting GesturesMarketplaceURL in settings.xml to represent URL which points to the Gesture's Marketplace. - Added mGetMoreItemIndex instance variable (similar to mViewAllItemIndex which was already there). - Added mGetMoreItemIndex handling in the LLGestureComboList::onCommitGesture() (again, similar to mViewAllItemIndex). - Added new string in strings.xml with name GetMoreGestures to represent Gesture's list item. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/386/ --HG-- branch : product-engine
2010-05-12merge from PE's viewer-trunkTofu Linden
2010-05-11EXT-6686 FIXED Added PARCEL_DETAILS_ID to the list of highlightable keywords ↵Vadim Savchuk
in script editor. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/365/ --HG-- branch : product-engine
2010-05-10Automated MergeRoxie Linden
2010-05-07EXT-7276: Hide "paste as link" under Debug Setting ("InventoryLinking")Loren Shih
In viewer2.0, paste as link was only allowed in god mode. Here, it is allowable if the user sets a debug setting. This prevents normal users from accidentally screwing up their inventory if they don't understand what a link is.
2010-05-06EXT-6102 FIXED Add custom view for world rect with special reshape processingYuri Chebotarev
reviwed Mike Antipov at https://codereview.productengine.com/secondlife/r/357/ --HG-- branch : product-engine
2010-05-05pull a stray change from the old viewer-trunkTofu Linden
2010-05-05EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by MossKarl Stiefvater (qarl)
(changes name of setting WindowFullScreen to FullScreen per discussion in jira.)
2010-05-04Automated mergeRoxie Linden
2010-05-04EXT-7214 : FIXED : Add debug setting to show avatar rez timesLoren Shih
Changed from #define to debug setting "DebugAvatarRezTime".
2010-05-04DEV-45807 - worldmap doesn't work against non maingrid serversRoxie Linden
The code used to retrieve the tiles for the world map was hardcoded to retrieve the map tiles via s3. However, non-maingrid servers do not necessarily publish their map tiles to s3. The URL was in the form http://map.secondlife.com.s3.amazonaws.com/map-<level>-<x>-<y>-objects.jpg This change removes the hard coding and places the default s3 URL in the settings.xml file via MapServerURL. Login retrieves the specific grids URL via a map-server-url option. The url is still expected to contain jpegs named like map-<level>-<x>-<y>-objects.jpg CR: Karina Linden
2010-05-01merge from PE's viewer-trunkTofu Linden
2010-04-30MergeLeyla Farazha
2010-04-30updated media attenuation functionLeyla Farazha
reviewed by Richard
2010-04-30Implemented task EXT-6559 (Appearance panel: Add edit button in place of the ↵Vadim Savchuk
image display next to current look). - Changed the topmost part of the Appearance panel: * Added new "Edit current outfit" button. * Implemented COF status display (unsaved/wearing) according to the spec. * Minor XUI changes (font / dimensions / bg color). - Removed the temporary "Edit current outfit" button from the bottom of the Appearance panel. - Removed the temporary "ShowDebugAppearanceEditor" setting. TODO: use icons from the spec (currently missing). Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/339/ --HG-- branch : product-engine
2010-04-28Media sound attentuation first passLeyla Farazha
reviewed by Richard
2010-04-27Architectural changes to LLPlugin message processing.Monroe Linden
LLPluginProcessParent can now optionally use a separate thread for reading messages from plugin sockets. If this is enabled, it will spawn a single thread and use apr_pollset_poll to wake up the thread when incoming data arrives instead of polling all the descriptors round-robin every frame. This should be somewhat more efficient, and should also allow blocking requests from plugins to be serviced much more quickly (once we start using them). This is currently disabled by default, until it's had a bit more focused testing on multiple platforms. Hooked up the switch to use the message read thread to the PluginUseReadThread debug setting and an item in the Advanced menu in the viewer, and to a checkbox in the UI in llmediaplugintest. Updated some debug logging in the plugin system to have appropriate tags and not log dire-looking warnings during normal operation. LLPluginProcessParent now once again explicitly kills plugin processes (instead of just closing their sockets and waiting for them to exit). The problem we were attempting to solve by not doing the kill (letting the webkit plugin write its cookie file on exit) has been solved another way. LLPluginProcessParent::sendMessage() now attempts to write the outgoing message to the socket immediately instead of waiting for the next frame. This should reduce the latency of sending plugin messages. Added a separate fast timer for LLViewerMedia::updateMedia().
2010-04-23fixed EXT-6891 Region name SLurl is absent ot teleport offer toast if long ↵Alexei Arabadji
message was added Decreased limit of teleport offer text invitaton to 178 characters(254 - max_location_url_length(76)) reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/302/ --HG-- branch : product-engine
2010-04-21Automated mergeRoxie Linden
2010-04-21Remove diamondware and rearrange login panel to be like it is in the default ↵Roxie Linden
viewer 2 build
2010-04-21merge from viewer-hotfixTofu Linden
2010-04-21mergeTofu Linden
2010-04-21Show beta grids depending on a settings.xml setting. for SLE, this will be ↵Roxie Linden
turned off. For trunk, it's turned on. Also, fixed an issue with manual entry of locations into the location dropdown.
2010-04-20Disabling Watchdog TimeoutMark Palange (Mani)
2010-04-20fix for EXT-4082 Normal Uploading huge image crashes viewerYuri Chebotarev
https://codereview.productengine.com/secondlife/r/11/ reviewed Tofu Linden --HG-- branch : product-engine
2010-04-19automated merge with trunkRoxie Linden
2010-04-14Fixed critical bug EXT-6847 (Default configuration has Away Timeout set to ↵Mike Antipov
"Never") Reason: changeset 97654b5b6313 for EXT-4843 [NUX] Set default Preferences. Setting was reset to 0. Fix: restored default value 300. Also updated setting's description with supported combobox values (0, 120, 300, 600, 1800) Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/234/ --HG-- branch : product-engine
2010-04-13Completed normal subtask EXT-6621 (Code cleanup: Remove unused ↵Mike Antipov
LLFloaterActiveSpeakers and related classes from viewer) * Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo. * Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt). * Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove). * Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions. * Also removed old textures related to removed xml and unused in 2.0 anymore. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/ --HG-- branch : product-engine
2010-04-13mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-13Fixed normal bug EXT-6034 (Need "View People Icons" option for group IM ↵Eugene Mutavchi
window) - added new menu item to participant list menu for group and ad-hoc chats. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/225/. --HG-- branch : product-engine
2010-04-13PE merge from PE's viewer-trunkTofu Linden