summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
AgeCommit message (Collapse)Author
2010-01-18Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-18implemented Task EXT-572 Action buttons on toast should size to word for ↵Denis Serdjuk
internationalization Changes: 1. Remove hard coded button's width. Now buttons will be reshaped to required size if the required width is bigger then default. 2. Default width is configurable now. --HG-- branch : product-engine
2010-01-14EXT-4340: Add "debug" flag to Help URL in god mode.Lynx Linden
2010-01-13mergerichard
2010-01-13DEV-44861: Support a home_sidetray_url from login.cgiLynx Linden
The URL for the Home side tray is specified in settings.xml. It can now be overriden on a grid-level via a "home_sidetray_url" token sent by login.cgi. I also updated the Home URL in settings.xml to pass through a bunch of information to the web server as query params. These include: p= : the authentication token from login.cgi lang= : the user's current two-letter language setting channel= : the viewer's channel name, e.g., "Second Life Beta", "Second Life Release", "Snowglobe", etc. version= : the viewer's version number, e.g., "2.0.0.200712" major= : the viewer's major version number, e.g. "2" minor= : the viewer's minor version number, e.g. "0"
2010-01-12Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-12moved floater-specific setting to settings.xml frmo string embedded in floaterrichard
2010-01-08First pass expose inventory item settings in XML (folder_view_item.xml)James Cook
Optimized LLFolderViewItem constructor by passing param block as const ref to avoid copies. Removed per-item arrow and background images, use defaults. Removed unneeded static image pointers. Removed hard-coded rounded_square.tga, replaced with Rounded_Square Ditto for folder_arrow.tga Reviewed with Richard.
2010-01-08Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-07mergerichard
2010-01-07Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-06MergeLeyla Farazha
2010-01-06EXT-3824 [BSI] Rename Inventory Item Text CutoffLeyla Farazha
EXT-3757 Text Placement is Too High when Editing Landmark/Outfit/Notecard Names reviewed by Richard
2010-01-06EXT-3962: added "MyOutfitsAutofill" debug setting to force auto population.Eric M. Tulla (BigPapi)
2010-01-06Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2010-01-05Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2010-01-05DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many placesTofu Linden
2010-01-05Completed low task EXT-3759 (NOTFORBETA0: Phone numbers for AvaLine calls ↵Mike Antipov
should be human readable) -- for now phone number is split on parts by two digits from right to left. The first left part can have 2 or 3 digits, i.e. +44-33-33-44-55-66 or 12-34-56-78-90. --HG-- branch : product-engine
2009-12-30EXT-1399 Restore some wind noise when standing still, but drop volumeJames Cook
Make wind volume configurable via setting AudioLevelWind, currently set to 0.5. Changing this to 1.0 will restore the viewer 1.23 behavior Reviewed with Leyla.
2009-12-30EXT-3753 Made inventory subfolders indent more.James Cook
Changed back to 8 pixel indent, as Ben Glenn was seeing confusion in user tests with lesser indents. Made it a setting, FolderIndentation in case we want to change in the future. Reviewed with Leyla.
2009-12-30automated merge PE->viewer2.0Kent Quirk
2009-12-29for DEV-44376: create a switch for texture decoding.Xiaohong Bao
2009-12-28Fixed normal bug EXT-2791 - Upload Image / sound / animation missing cost.Dmitry Zaporozhan
--HG-- branch : product-engine
2009-12-24Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-23EXT-3679: Send Session, Region, and Parcel IDs to Search.Lynx Linden
These IDs are sent as the following query parameters to the search server: sid=, rid=, pid=, for the Session ID, Region ID, and Parcel ID respectively. For some reason, Parcel ID always seems to be NULL though. I'll file a separate JIRA for that.
2009-12-23Work on normal task EXT-3636 (Code Improvements: Voice control panels - Make ↵Mike Antipov
Voice states and fade timeout xml driven) -- made timeout to fade HAS LEFT Voice participant xml driven --HG-- branch : product-engine
2009-12-18Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-18Merge, pulling in viewer-2-0James Cook
2009-12-16MergeJames Cook
2009-12-16merge with avp-tipNyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-16EXT-3514 update debug settings for new appearance featuresNyx (Neal Orman)
following changes: 1) remove renderavatarinvisible - no longer need this debug setting 2) add showobjectrenderingcost (default:TRUE) so we can turn this feature off if necessary 3) add showdebugappearanceeditor (default:FALSE) so we can test the future appearance editor code reviewed by vir and seraph --HG-- branch : avatar-pipeline
2009-12-15Mergeskolb
2009-12-15Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-15Add a PrimMediaMasterEnabled debug flag to allow us to disable the media ↵Rick Pasetto
data client Conceptually reviewed by Monroe
2009-12-15EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time optionsLeyla Farazha
EXT-2649 [BSI] Confirm on Drop EXT-3416 Can't name a new gesture on creation (and renaming is HARD) reviewed by James
2009-12-15EXT-3496: Add a common authentication key for search and home.Lynx Linden
Search and the Home sidetray now have their own specific authentication keys that they support from login.cgi, but they fallback to a common key as follows: Search: "search_token", fallback to "auth_token" Home: "home_sidetray_token", fallback to "auth_token"
2009-12-15EXT-3180: Update Home sidetray to temporary URL.Lynx Linden
2009-12-15mergeRick Pasetto
2009-12-15EXT-3441: Support various substitutions for Search URL.Lynx Linden
The search URL is now specified in app_settings/settings.xml (instead of in floater_search.xml), and it is now defined more flexibly with support for various substitution strings, such as [QUERY], [AUTH_KEY], [MATURITY], [GODLIKE], etc. I pulled the common substitution code out into a new static method, LLWeb::expandURLSubstitutions(). This provides support for common strings like [VERSION], [CHANNEL], [LANGUAGE], [OS], etc. The Help and Home sidetray code has been updated to use this new function, to avoid replicating this behavior 3 times. I also cleaned up the app_settings/settings.xml file and removed the old search keys of: SearchURLDefault, SearchURLQuery, and SearchURLSuffix2.
2009-12-15Adjusted button label vertical placement and input field text vertical ↵Justin C. Rounds (Chuck)
placement to match.
2009-12-14mergerichard
2009-12-11EXT-3233 Button label vertical placement cannot be adjusted via xmlJames Cook
Added bottom_pad attribute to widgets/button.xml and removed old LLBUTTON_VPAD global and ButtonVPad saved setting. Reviewed with Richard.
2009-12-11Merge media back into viewer 2-0skolb
2009-12-10PARTIAL DEV-43869 - add "isInterestingEnough()" to the queue calculationRick Pasetto
This change bumps the queue sizes way up, because we think that the "isInterestingEnough()" call will prevent loading more media data than we think is necessary. Still need to implement it in LLVOVolume, though
2009-12-10PARTIAL DEV-43869: LLMediaDataClient now uses two queuesRick Pasetto
This is a fairly major change that addresses the issue of an object with constantly-updating media. Before, that object would be put into our single queue and sorted to a particular spot, and since it continuously updates, it would "always be there". That means that nothing "behind" it would ever get serviced. This change introduces two queues for each MDC: one is the same "sorted" queue as before, and the other is unsorted, and "round-robins". New objects go into the sorted queue, objects whose media we already know about get put into the unsorted queue. The two queues are interleaved when serviced (one then the other is serviced -- if one is empty we try the other -- until they are both drained). The round-robin queue works a little differently: after an item is fetched from that queue (remember this would be an item we already know about), that request is marked and put back at the end of the queue. If that object gets a UDP update while in the queue, that mark is "cleared". When it gets to the front of the queue again, if it still marked, it is thrown away. If it is not marked, it is fetched, and again marked and put at the end. This makes the queue self-limiting in how big it can get. I have also made some other changes: - The sorting comparator now just delegates to the object for its "interest" calculation. A higher value = more interesting. LLVOVolume now uses its PixelArea for its "interest" calculation, which seems apparently better (the prior distance calculation was wrong anyway). - The score is cached before the sort operation is performed, so that it won't be expensive to sort - Now, the media version that is fetched is saved in the LLVOVolume, and we do not update if it is not newer (this is not very useful...yet.) - I've introduced hard limits (settable by debug settings) on the size of the queues. The sorted queue will be culled (after sort) to that count. NOTE: this will probably get removed in a later checkin, as I've already gotten feedback that this is not desirable - I've reorganized LLMediaDataClient so it makes more sense. - I've made the request object a little smaller, so the queue won't take up so much memory (more work could be done here) - Added a unit test for the two-queue case (though more tests are needed!)
2009-12-10Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0Rick Pasetto
2009-12-10Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-09EXT-2896 Fixed poor handling of login error.Mark Palange (Mani)
Added more cleanup to the reset_login call. Added new settings to control UseCircuitCode message timeouts to allow testing of this failure. Reviewed by Richard
2009-12-09Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-08Mergerichard