summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2009-12-17mergeRick Pasetto
2009-12-17Change "url prefix" to "url pattern"Rick Pasetto
2009-12-17Fixed carriage return text to use word wrap insteadskolb
2009-12-17Mergeskolb
2009-12-17Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-17EXT-2636: we now show "Loading..." before the my inventory named folder when ↵Eric M. Tulla (BigPapi)
doing a background fetch.
2009-12-17Mergeskolb
2009-12-16L10N: harmless commit to test the Viewer Localization Tool, which has been ↵Ramzi Linden
broken for 46 days.
2009-12-16Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-16DEV-42827: auto-hide media controls volume slider if neither it nor mute ↵Rick Pasetto
button has the mouse over it Review #66 fade-out was going to be harder, but just making it visible/invisible turned out to be pretty easy
2009-12-16DEV-41904: Have F1 key bring up context-sensitive help for media controlsRick Pasetto
Review #65 Adds help topic to media controls panel, and add handling F1 key to media focus
2009-12-16local mergeSamuel Kolb
2009-12-16Merge with tipcallum
2009-12-16product engine -> viewer2.0 mergeLoren Shih
2009-12-16local mergeSamuel Kolb
2009-12-16Tweaks to XUI to make sure long urls are clipped in various dialogs.callum
2009-12-16Undo previous change to this file.Rick Pasetto
2009-12-15automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
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-15automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-15EXT-3199 : Re-enable task inspection inventory sidepanelLoren Shih
Re-added the task sidepanel. Fixed bottom button layout. Edit mode now always returns true for inventory sidepanels. --HG-- branch : avatar-pipeline
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-14merge with avatar-pipelineNyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-14mergerichard
2009-12-14manually mergerichard
2009-12-14EXT-3370 integrate tab-ification to appearance sidepanelNyx (Neal Orman)
Moved elements around so that the bottom bar is contained in the outfits panel XUI changes by erica/chuck/nyx code changes by nyx code reviewed by Bigpapi --HG-- branch : avatar-pipeline
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-16Un-hardcoded a couple of strings.Vadim Savchuk
--HG-- branch : product-engine
2009-12-16Fixed low bug EXT-3188 ("There are no picks/classfields here" messageAndrew Dyukov
should appear in "Picks" tab after the server response and not to). - added "Loading..." message - changed condition on which "There are no picks/classfields here" is shown and moved message string to strings.xml --HG-- branch : product-engine
2009-12-16Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-16implemented major task EXT-3473 Increase min width of IM Floater (increased ↵Andrew Polunin
by 20%) --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