summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-17Merge.Tofu Linden
2009-12-17DEV-43898 Enable Flash-on-a-prim on Linux. Yowza!Tofu Linden
2009-12-17EXT-3552 : Opening a box and copy the items to inventroy also opens an ↵Loren Shih
inventory floater InventorySP/InventoryFloater open behavior now follows 2.0 conventions -- sidepanel will open in preference to floater.
2009-12-17Fix a code comment now that we enable NSAPI plugins under Darwin.Tofu Linden
2009-12-17mergeLeyla Farazha
2009-12-17removing mCancelOnCloseLeyla Farazha
2009-12-17mergeLeyla Farazha
2009-12-17mergerichard
2009-12-17reverted to viewer-2 copy of sidepanel_item_info.xmlrichard
2009-12-17MergeSteve Bennetts
2009-12-17HTTP Texture changes:Steve Bennetts
* Fixed bug in llqueuedthread.cpp causing unnecesssary sleeeping * Fixed an issue that was preventing retries on 503 errors * Added number of pending creates to Texture View * Increased time allocated for texture creates
2009-12-17Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-12-17Chuck's edits to the appearance editorErica
2009-12-17EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav ↵Leyla Farazha
and/or Favorites Bar are Hidden EXT-3334 [BSI] Chat/IM log preferences not retained EXT-3402 Replace "X" for checked menu items with a check mark glyph [Patch Included] reviewed by richard
2009-12-17MergeJames Cook
2009-12-17EXT-3516 X Button should end IM session, _ button should hideJames Cook
I don't like it, but I don't have a better suggestion. Reviewed with Steve.
2009-12-17dos2unix line ending fix for llviewermenufile.cppLoren Shih
--HG-- branch : avatar-pipeline
2009-12-17automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-17automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-17EXT-3329 : Able to delete system folder is confusing - disable from non-god modeLoren Shih
"Delete" no longer works for system folders. Created a new "Delete System Folder" context menu entry that only works in RelWithDebug if only one item is selected. --HG-- branch : avatar-pipeline
2009-12-17Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/Justin C. Rounds (Chuck)
2009-12-17Started clean-up of appearance floater layout.Justin C. Rounds (Chuck)
2009-12-17revert -3 6510 sidepanel_item_info.xmlSteve Bennetts
2009-12-17Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-12-17EXT-3555 Top menu no longer changes color when in God mode, Button height ↵Erica
unsquooshing from Lis
2009-12-18Fixed normal bug EXT-637 (Please, add tooltips with a full names of the ↵Sergey Borushevsky
landmraks in the Favor bar / Overflow menu) Fixed problem with overlapping of tool tip by menu. --HG-- branch : product-engine
2009-12-17MergeJames Cook
2009-12-17EXT-3508 Animation : preview play / stop button does not refresh previewJames Cook
Moved all play/pause button visibility code into the refresh() method. Reviewed with Leyla.
2009-12-17add newline to unbreak linux build. probably.Tofu Linden
2009-12-17mergeRick Pasetto
2009-12-17Change "url prefix" to "url pattern"Rick Pasetto
2009-12-17Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-17EXT-3551 make outfit functionality non-discoverableNyx (Neal Orman)
removed + button, added make outfit button. make outfit button is only enabled if the "my outfits" tab is selected. Code reviewed by Vir --HG-- branch : avatar-pipeline
2009-12-17automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-17EXT-2677 : "Remove From Outfit" active even when I'm not wearing any items ↵Loren Shih
in the folder Now checking contents of the folder for any actively worn items for determining this flag. --HG-- branch : avatar-pipeline
2009-12-17pe -> viewer2.0 mergeLoren Shih
2009-12-17EXT-1634 : Block collapse/expand of accordion "root" folder by keywordLoren Shih
Hidden folders are no longer allowed to be selected. --HG-- branch : avatar-pipeline
2009-12-17Turned debug spam in LLViewerMedia::isInterestingEnough() down to lldebugs.Monroe Linden
2009-12-17Rearranged the handling of error status codes in LLMimeDiscoveryResponder. ↵Monroe Linden
We should now deal with many more classes of subtly misbehaving web servers, and will use the returned MIME type for 4xx errors instead of guessing text/html.
2009-12-17EXT-3535 Don't show the tutorial on first log-inJames Cook
Discussed with Esbee and Howard - we're not doing a web-based tutorial. If we want it back, we'll have to do another viewer release.
2009-12-17Quiet some logging, make sure if 1024 is lowest we still load itRick Pasetto
2009-12-17made setupParams do coordinate flipping and negative coordinate magic only ↵richard
for XUI-based params
2009-12-17replaced llsd_equals with string based llsd comparison for more consistent ↵richard
support
2009-12-17fix for bad xui warnings when loading font from legacy "resource" namerichard
2009-12-17fixed some bad xui paramsrichard
2009-12-17made color_swatch border color consistentrichard
2009-12-17oops, forgot to remove assertrichard
2009-12-17clamp instead of assert when running out of room during reflowrichard
2009-12-17Mergeskolb
2009-12-17Set an explicit "Accept" header when doing the MIME type probe. This ↵Monroe Linden
prevents LLHTTPClient from adding an "Accept: application/llsd+xml", which is just wrong.