summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2009-12-09automated mergeLoren Shih
2009-12-09automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-09EXT-3274 : Landmarks or Favorites accordion panel shows up as emptyLoren Shih
EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab Forcing top-level folders open when accordion is active. Removed logic that was saving and restoring initial folder state. --HG-- branch : avatar-pipeline
2009-12-09fix for linux build breakage, a LLPointer was being implicitly cast wrongNyx (Neal Orman)
approved by Seraph --HG-- branch : avatar-pipeline
2009-12-09Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-09EXT-2819 crash in color picker in appearance editorNyx (Neal Orman)
Made progress by writing code to match the style we use for the texture picker. It now should not make a difference if you destroy the color picker floater or the color swatch control first - either direction it should do sufficient cleanup and protection. However, still getting this crash. Will investigate further later. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-09Reduce likelihood of indefinite wait in viewer integration tests.Nat Goodspeed
Introduce LLStartupListener to allow viewerclient-based test script to query startup state. This handles the scenario in which, by the time the test script manages to connect, the viewer already IS in STATE_STARTED. Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make that wait time out eventually to deal with "System currently logging you off, please wait 5 minutes." Timeout raises new ViewerWontLogin exception. Fix testlangs to catch ViewerWontLogin and retry a limited number of times.
2009-12-08mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-08Merge backoutJames Cook
2009-12-08Back out EXT-2827 Unable to delete object when select face of objectJames Cook
May cause right-click delete to fail - testing that Backed out changeset: 1f8e1e73f9f4
2009-12-08Merge with Lis and Leyla' stuffJames Cook
2009-12-08EXT-3118 disabled Alerts appear to be enabled in PreferencesJames Cook
Wasn't rebuilding the list of alerts on Preferences open Cleaned up some formatting in llfloaterpreference.cpp
2009-12-08EXT-2980 Made location history menu items XML-configurableJames Cook
Reviewed with Leyla
2009-12-08EXT-3256 : Show help message in Favorites bar if emptyLoren Shih
--HG-- branch : avatar-pipeline
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08EXT-3192 Preferences > Sounds UI issuesLis Pardi
2009-12-08automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-08mergerichard
2009-12-08EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory ↵Loren Shih
accordion Put in a quick fix so that folders can't be made reparented to their own children. --HG-- branch : avatar-pipeline
2009-12-08EXT-3266 : Object contents show up as empty alwaysLoren Shih
InventoryFilter was rejecting all items that didn't exist in agent inventory. Changed this to properly account for inventory of in-world objects. --HG-- branch : avatar-pipeline
2009-12-08L10N: add a helpful tooltip to the refresh icon, as done in other places in ↵Ramzi Linden
the UI
2009-12-08INFRASTRUCTURE: Took out unused function "getAllAttachmentsArray" from ↵Loren Shih
llvoavatarself. --HG-- branch : avatar-pipeline
2009-12-08L10N: clarify wording in panel_group_notice accordian. Please, no more Ascii ↵Ramzi Linden
art arrows in 2.0.
2009-12-08L10N: Add much-needed linguistic context in the comments of strings.xmlRamzi Linden
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08Re-adding references to Arrow_Up and Arrow_Down so these arrows show on ↵Lis Pardi
panel_preferences_alerts.xml
2009-12-08Capitalized the tab labels.Justin C. Rounds (Chuck)
Bonus: made them conform visually to other tabs in the side panel http://jira.secondlife.com/browse/EXT-3073
2009-12-08ext-3087 - avatar icon is truncated badlyrichard
reviewed by James
2009-12-08Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-08Changed "Assigned Roles" to "Assigned Members".Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-3079
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08EXT-2599 Temporary Text in filter fields should be a lighter color than User ↵Lis Pardi
typed text
2009-12-08Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-08World > Snapshot is supposed to have separators, per the Design Spec - Top MenuRamzi Linden
L10N: use the consistent term 'Side Tray' already used elsewhere in the UI. Even if this isnt visible, it becomes part of our glossary and translation.
2009-12-08Added space between Server message output area and expand button to prevent ↵Justin C. Rounds (Chuck)
overlapping elements. http://jira.secondlife.com/browse/EXT-3116
2009-12-08L10N: use consistent terminology in tooltip for a button that does the same ↵Ramzi Linden
thing as the one in the Navigation Bar
2009-12-08For EXT-3166 : MyInventory/Library Places accordions are causing massive ↵Loren Shih
inventory background fetch on startup Took out line to start background fetch at start of filter; the background fetch will start when the filter is started. This prevents the viewer from requesting a complete inventory fetch at login. --HG-- branch : avatar-pipeline
2009-12-08mergerichard
2009-12-08L10N: the terminology 'Show Profile' is not to spec. Make this consistent ↵Ramzi Linden
to 'View Profile' used everywhere else.
2009-12-08Mergerichard
2009-12-08mergerichard
2009-12-08ext-2049 - tighten up inventory indentationsrichard
2009-12-08Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-08Added context menu items to the list from the avatar context menu.Justin C. Rounds (Chuck)
https://jira.secondlife.com/browse/EXT-2863
2009-12-08Fix for unable to create alpha masks and tattoos in inventory menusBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08EXT-2276 Advanced water settings floater sliders spaced too tightLis Pardi
2009-12-08automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-08Automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline