summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-10automated merge viewer2.0->viewer2.0Loren Shih
2009-12-10Dos2Unix fix for llselectmgr.cppLoren Shih
2009-12-10automated merge viewer2.0->viewer2.0Loren Shih
2009-12-10Merge with product-engineSteve Bennetts
2009-12-10mergeIgor Borovkov
--HG-- branch : product-engine
2009-12-10fixed EXT-3247 (There is no title in Ad-hoc IM window, and only "To" is ↵Igor Borovkov
shown if user accepts Ad-hoc conference) sometimes a session name received from a server is empty, added generating a correct session name in such a case --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-10implemented EXT-3341 “URLs should be clickable in the IM toasts”,Alexei Arabadji
replaced mouseDown callback with handleMouseDown method to provide possibility to separate mouse down event on panel and in panel children; --HG-- branch : product-engine
2009-12-10Fixed 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-10Fixed linux buildPaul Guslisty
--HG-- branch : product-engine
2009-12-10EXT-2819 : Crash in appearance color pickerLoren Shih
Enforcing out-of-order destruction in llfloatercustomize to avoid this crash.
2009-12-10EXT-2819 : Crash in appearance color pickerLoren Shih
Enforcing out-of-order destruction in llfloatercustomize to avoid this crash.
2009-12-10EXT-3355 : InventorYSP no longer auto-opensLoren Shih
Fixed merge from changeset: 156496ce7d3f to restore my original getActiveInventoryPanel code.
2009-12-10fixed EXT-3300 “Wrong notification count in notifications well”,Alexei Arabadji
avoided creation of LLNotificationWellWindow before creation of notification well chiclet; --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-10implmented EXT-2830 “"Object auto-return" notification should contain ↵Alexei Arabadji
reference to returned object”, removed 'Inspect' button from ServerObjectMessage notification; --HG-- branch : product-engine
2009-12-10mergeVadim Savchuk
--HG-- branch : product-engine
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-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-09last blind fixup for llmediaplugintest.Tofu Linden
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-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-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