summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-10Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-10DEV-41317 DEV-42311: Improved auto-call implementation.Lynx Linden
Improved the implementation for auto-connecting an adhoc call. This involved having the controller (LLIMMgr) set a flag in the model (LLIMModel) to autoconnect on initialize. Now all of the view code (LLPanelChatControlPanel) and the signal/callback infrastructure that I added earlier can be removed as it violated MVP separation. Ah! Much nicer. Thanks to PE folk for the suggestion.
2009-12-10fixed EXT-3250 There should be no "Group info" button for Ad-hoc conferenceIgor Borovkov
caused by misdetection of IM type --HG-- branch : product-engine
2009-12-10fixed normal bug EXT-3284 \"Share\" ability is disabled in context menu in ↵Andrew Polunin
\"Nearby\", \"Friends\" and \"Recent\" tabs --HG-- branch : product-engine
2009-12-10Set temporal icon for "Scripting disabled" in navbar (EXT-3339).Andrew Dyukov
Finding appropriate icon is left to Erica. --HG-- branch : product-engine
2009-12-10implemented normal task EXT-2767 IM chiclet needs hard-coded reference to ↵Andrew Polunin
icn_voice-localchat.tga changed to Unread_IM --HG-- branch : product-engine
2009-12-10Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-12-10mplemented EXT-2801 “Record "object return" notification into IM history, notAlexei Arabadji
chat history”, added logging to IM for ServerObjectMessage notification; --HG-- branch : product-engine
2009-12-10Work on major task EXT-2808 (Add speakers moderation (both voice and text) ↵Mike Antipov
to the Voice Control Panel (Active Speakers List)) -- Added menu items, disabling them not in the group call -- Also refactored Mute Text functionality to be used in Block/Unblock menu item (For EXT-2863) --HG-- branch : product-engine
2009-12-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-12-09EXT-3298 world map does not load simulator texturesSteve Bennetts
Forgot to add LLCurl update call to non threaded LLTextureFetch update.
2009-12-09EXT-3063 cleanup of inventory item properties sidepanelNyx (Neal Orman)
step 1: kill the edit button step 2: disable info button on main inventory panel if more than one item is selected. other steps to be done will be filed as separate jiras code reviewed by seraph --HG-- branch : avatar-pipeline
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-09Fix for save texture functionality no longer respecting permissionsEric M. Tulla (BigPapi)
2009-12-09mergeMark Palange (Mani)
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-09EXT-3303 : Crash on select object inventory root folder and hover Build menuLoren Shih
Unsafe cast (which has existed since viewer1.23) was causing crash.
2009-12-09mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-09For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSPBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-09Merge with headcallum
2009-12-09last blind fixup for llmediaplugintest.Tofu Linden
2009-12-09Bunch of simple UI changes:callum
DEV-43885 EXT-3206: Number of media items UI in Nearby Media Floater clipped when there are a lot DEV-43884 EXT-3207: In Build Dialog, Under Texture Tab, should say "Media" and not "Media URL" DEV-43877 EXT-3221: Warning message about whitelists in Security Tab of Media settings floater appears incorrectly DEV-43875 EXT-3224: Media Text Box in the Build settings: Texture should be a label and not a text box DEV-43477 Popup for adding media to only one face is misleading Reviewed by Sam
2009-12-09get llmediaplugintest compiling on win32, dumbly.Tofu Linden
2009-12-09MergeJames Cook
2009-12-09Re-disable a very spewy debug spew in the webkit plugin. Mea culpa.Tofu Linden
2009-12-09Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-12-09Crash fix due to bad duplicated attributes in xuiErica
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-09blindly fix-up llmediaplugintest.cpp with respect to the recent API change.Tofu Linden
2009-12-09merge!Tofu Linden
2009-12-09MergeJames Cook
2009-12-09Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-09ext-2976 change "alerts" to read "notifications"Lis Pardi
2009-12-09Fix for EXT-2703 & EXT-2708 - save texture as issuesEric M. Tulla (BigPapi)
Added save as to texture preview floater. Fixed behavior of save as (was only working for textures, not snapshots). Removed advanced menu entry for save texture as (refused to work after multiple implementations).
2009-12-09MergeJames Cook
2009-12-09remove LL_PATH_BROWSER_PROFILETofu Linden
it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer.
2009-12-09Fix line endings.James Cook
2009-12-09MergeJames Cook
2010-12-08mergeLeyla Farazha
2010-12-08adding notes about visible / enable callback registries being mergedLeyla Farazha
2010-12-08EXT-2807 Update mini-inspector to include Group Voice Chat moderator controlsLeyla Farazha
reviewed by Richard
2010-12-07mergeLeyla Farazha
2010-12-07EXT-3265 Gear menu on_visible params are broken - not setting visibility of ↵Leyla Farazha
menu items EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2009-12-09EXT-2827 and fix for delete key not deleting objects while building.James Cook
Object inventory was grabbing edit menu handling during refresh. Put back Angela's code so that Right-click > Remove > Delete is now disabled if you have a single face selected. Fixed LLSelectMgr::contains() for SELECT_ALL_TES case. Reviewed with Richard.
2009-12-09EXT-2980 Remove indentation on back button history list.James Cook
Design reviewed with Lis
2009-12-09DEV-43948 viewer2 is writing session data into the 'read-only' installation ↵Tofu Linden
tree (mostly media stuff) propagate the parent app's OSUserAppDir (i.e. ~/.secondlife/) all the way down to plugins, if they need persistant user data/settings (like the webkit plugin needs a place to put its cache).
2009-12-09mergebea@american.lindenlab.com
2009-12-09mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-09Added Doxygen commentsbea@american.lindenlab.com
2009-12-09avp->avp mergeLoren Shih
--HG-- branch : avatar-pipeline