summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Collapse)Author
2009-12-15Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-15L10N: some legacy strings were left in panel_preferences_setup.xml. At least ↵Ramzi Linden
I will make them consistent.
2009-12-15Merging in latest PE changes from ↵Eric M. Tulla (BigPapi)
https://hg.aws.productengine.com/secondlife/viewer-2-0/
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-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-15Fixed normal bug EXT - 3288 (Tool-tips are missing on whole Places panel)Paul Guslisty
--HG-- branch : product-engine
2009-12-14Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-14DEV-43872: Change Home URL and Current URL to Home Page and Current PageRick Pasetto
2009-12-14L10N: used consistent terms between Pref > Advanced and floater_select_key !Ramzi Linden
2009-12-14DEV-43913: tweak positions of play & pause so they look like they are the ↵Rick Pasetto
same button
2009-12-14follow-up from my last changeRick Pasetto
2009-12-14mergerichard
2009-12-14mergerichard
2009-12-14manually mergerichard
2009-12-14Merge with Tipcallum
2009-12-14EXT-1940 combo-box with dropdown list of scales overlaps Cancel btn un the ↵Lis Pardi
Texture dlg
2009-12-14Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media ↵callum
Settings : Controls tab"
2009-12-14mergerichard
2009-12-14ext-3297 Input/Output devices are cut off in preferencesLis Pardi
2009-12-14EXT-3338 Start up screen isn't resized - reviewed by richard, The LayoutmasterErica
2009-12-14Fixed low bug EXT - 3255 (Call button is enabled in the People & Profile ↵Paul Guslisty
panels while voice is disabled) --HG-- branch : product-engine
2009-12-14automated merge avp->viewer2.0Loren Shih
2009-12-14For EXT-3264: Missing separators in inventory context menus - restoreBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-14Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-14Fixed Normal bug EXT-3115 ("Unable to start new chat session" ↵Mike Antipov
MissingString(generic)) -- added string with name="generic" with the same value as "generic_request_error" into strings.xml (because "generic" is a part of server's response body) --HG-- branch : product-engine
2009-12-13 EXT-3422 Add IM/Notification pending button art, style and layout of ↵Erica
overflow arrows, align message well with bottom bar
2009-12-13EXT-2764 EXT-2766 add and remove help ids to reflect realityKent Quirk
2009-12-12mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11For EXT-3264: Missing separators in inventory context menus - restoreBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11Mergeskolb
2009-12-11DEV-40452 (followup) Correct a few more inconsistencies in the 3 new LSL ↵Ramzi Linden
editor tooltips
2009-12-11fix multiple heads in repoEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-11MergeJames Cook
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-11resolving sidepanel conflictErica
--HG-- branch : avatar-pipeline
2009-12-11automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-11Mergeskolb
2009-12-11Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-11Updates to filter field labels to make more consistent.Justin C. Rounds (Chuck)
https://jira.secondlife.com/browse/EXT-2307
2009-12-11Fixed normal bug EXT - 2863 (Group Chat List Names right click do not ↵Paul Guslisty
contain view profile or send private message) --HG-- branch : product-engine
2009-12-11Fixed normal bug EXT-3281 (Group : Disable "Leave Group" for none).Andrew Dyukov
--HG-- branch : product-engine
2009-12-11EXT-906 Update inventory properties floater with new permissions layoutErica
2009-12-11EXT-3313 Media Settings window has no background if viewer is too shortJames Cook
Code to set default floater position to top-left was causing incorrect floater height computation when floater XML specified a bottom coordinate. Reviewed with Callum.
2009-12-11Merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-11Merge, fixed conflict in panel_preferences_sound.xmlJames Cook
2009-12-11Merge media back into viewer 2-0skolb
2009-12-11Merge viewer 2-0 into mediaskolb
2009-12-11EXT-3394: Remove manual voice gain controls.Lynx Linden
The new Vivox SDK supports Automatic Gain Control (AGC), so we shouldn't need to change the local gain level from the default of 50%. This change sets the initial gain level to 50 (instead of 62) and removes the local gain sliders from the Sound Preferences floater and the Voice Controls floater. The latter was not hooked up yet anyway.
2009-12-11mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-11mergeYuri Chebotarev
--HG-- branch : product-engine