summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-03Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-12-03Work around Linux viewer test program catch failureNat Goodspeed
2009-12-03MergeMark Palange (Mani)
2009-12-03Fix to windows build breakages.Mark Palange (Mani)
Reviewed by Brad
2009-12-03Merge from product-engineSteve Bennetts
2009-12-03Un-threaded LLTextureFetch to address potential performance and edge case ↵Steve Bennetts
crash issues. Changed an assert to an llerrs with extra info Added "HTTP Textures" to "Develop" menu
2009-12-03Fixed a crash when clearing private data twice.Steve Bennetts
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-03Fix for DEV-43696 (media streams should have hard limit of 8)Monroe Linden
This was just an off-by-one error in the hard limit calculation (> instead of >=).
2009-12-03Don't show controls if build tools are upRick Pasetto
2009-12-03remove fudge factor for controls background renderingRick Pasetto
2009-12-03merge of avatar-pipeline branch into viewer2Eric M. Tulla (BigPapi)
2009-12-03DEV-43463: swap visit_and_connect() overloads for Linux compilerNat Goodspeed
2009-12-03Fixed broken buildskolb
2009-12-03Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-03local mergeskolb
2009-12-03Merge with recent viewer-2-0Nat Goodspeed
2009-12-03Skip logging test that fails on Linux, no idea whyNat Goodspeed
2009-12-03merge of viewer2 into avp branchEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-12-03Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TESTNat Goodspeed
2009-12-03Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-12-03Fixed minor bug EXT-2466 (Call menuitem in the Friends context menu is ↵Sergey Borushevsky
disabled always) --HG-- branch : product-engine
2009-12-03fixed 'accept' of voice group chatAlexei Arabadji
--HG-- branch : product-engine
2009-12-03Reconcile llsdutil_tut.cpp with Kent's LLSD API changeNat Goodspeed
2009-12-03mergebea@american.lindenlab.com
2009-12-03mergebea@american.lindenlab.com
2009-12-03Add Doxygen commentsbea@american.lindenlab.com
2009-12-03Fixed normal bug EXT-3021 - Viewer crashes on receiving notification for ↵Dmitry Zaporozhan
creating script(offer) chiclet for same object in second time. --HG-- branch : product-engine
2009-12-03fixing bad cast that was causing a compiler error.Nyx (Neal Orman)
Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-12-03Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-03fix for normal EXT-3077 [BSI] Object chat of objects without a name bork ↵Yuri Chebotarev
nearby chat toasts and log for information - since I think that messages from nowhere is bad practice for user - if object that send message has no name I use object id as name --HG-- branch : product-engine
2009-12-03fix for normal EXT-2944 [BSI] Object chat and Resident chat is combined in ↵Yuri Chebotarev
Nearby Chat floater when object and Resident share the same name --HG-- branch : product-engine
2009-12-02DEV-42827 Implement volume slider on media controlsRick Pasetto
Introducing a volume slider that pops up when you hover over the "mute" button. Fades out with the rest of the controls. Had to also render (by hand) the background image. Cleaned up the XUI file.
2009-12-02local mergeskolb
2009-12-02removed the unused AutoPlayMedia flag. This is now governed by the ↵skolb
ParcelMediaAutoPlayEnable flag.
2009-12-02unify the two media auto play preferences into one. The ↵skolb
ParcelMediaAutoPlayEnable flag now controls both (horribly named, but must be preserved for legacy purposes).
2009-12-02Changed the behavior of LLViewerMediaImpl::setDisabled() to interact more ↵Monroe Linden
predictably with auto-play. Disabling and re-enabling media should work much more like teleporting away and teleporting back -- media will respect the auto-play flag when reloading, instead of returning to its previous load state.
2009-12-02Cleaned up the conditional code a bit in llviewerkeyboard.cpp, start_gestureskolb
2009-12-02DEV-42150 crash when using media on a HUDskolb
2009-12-02EXT-3060 : Turn links into broken links immediately when baseobj is purgedLoren Shih
EXT-3067 : INFRASTRUCTURE : LLInventoryPanel::modelChanged cleanup Added REBUILD mask to inventory observer. Added new logic for rebuilding linked items when an item is purged. Took out atrocious expensive refresh that was being triggered on most LLInventoryPanel::modelChanged. --HG-- branch : avatar-pipeline
2009-12-02EXT-3060 : Turn links into broken links immediately when baseobj is purgedLoren Shih
EXT-3067 : INFRASTRUCTURE : LLInventoryPanel::modelChanged cleanup This first set of checkins is just llinventorypanel infrastructure cleanup, including comments and improved use of iterators. --HG-- branch : avatar-pipeline
2009-12-02Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-02Minor changes from review feedbackRick Pasetto
get rid of thunk function
2009-12-02EXT-3050 : The Word "bar" Should be Removed from Section Headings on My ↵Loren Shih
Appearance Tab in Side Bar --HG-- branch : avatar-pipeline
2009-12-02EXT-3057 : Refine the context options that exist for broken linksLoren Shih
EXT-2950 : Trying to waer a link or to "Find Original" of a link silently fails when original is deleted Missing links are now handled correctly in the right-click context menu. --HG-- branch : avatar-pipeline
2009-12-02Merge viewer 2.0 into media branchskolb
2009-12-02mergeYuri Chebotarev
--HG-- branch : product-engine
2009-12-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)