summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-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-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-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-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-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-02EXT-2737 Fix for terrain/avatars/trees not showing up in water reflection.Runitai
2009-12-02Automated merge avp->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-02EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, ↵Loren Shih
llviewermessage More header file cleanup. --HG-- branch : avatar-pipeline
2009-12-02EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, ↵Loren Shih
llviewermessage More header file cleanup. --HG-- branch : avatar-pipeline
2009-12-02EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, ↵Loren Shih
llviewermessage Removed > 100 header includes from llviewermenu and llviewermessage. --HG-- branch : avatar-pipeline
2009-12-02EXT-3028 : "Find Original" does nothing if floater inventory isn't openLoren Shih
InventorySP will open if no inventory floaters are open. --HG-- branch : avatar-pipeline
2009-12-02Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-02merging in viewer-2 into avpNyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-01Fix a signed/unsigned warning that breaks the Windows build.callum
2009-12-01mergebea@american.lindenlab.com
2009-12-01Add Doxygen commentsbea@american.lindenlab.com
2009-12-01Automated merge with ssh://rick@hg.lindenlab.com/skolb/mediaRick Pasetto
2009-12-01Partial fix for EXT-2904/DEV-43584 (Space bar and Enter/Return key don't ↵Monroe Linden
work as input for checkboxes or buttons on MoaP). This change forces space characters to go through the keyEvent() path instead of the unicodeInput() path, which makes the space bar work for setting checkboxes. I still need to figure out what's going on with the enter key.
2009-12-01EXT-3028 : "Find Original" does nothing if floater inventory isn't openLoren Shih
Changed logic for getActiveInventory so that it considers InventorySP. Removed getActiveInventory and replaced with getActiveInventoryPanel since that follows its current usage. This currently contains a bug because the InventorySP always thinks it's open. --HG-- branch : avatar-pipeline
2009-12-01Mergeskolb
2009-12-01EXT-3033 Streaming audio is completely broken in Viewer 2.0skolb
2009-12-01DEV-43622 : API change (no functionality change) to fix a design error in LLSDKent Quirk
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01EXT-3028 : "Find Original" does nothing if floater inventory isn't openLoren Shih
Preliminary checkin, includes cleanup for llinventorypanel. Also removed several unused private classes and such from llinventorypanel. --HG-- branch : avatar-pipeline
2009-12-01EXT-2117 - Fix for not being able to add / remove multiple items of ↵Eric M. Tulla (BigPapi)
different types from your inventory
2009-12-01Fix for EXT-2892/DEV-43568 (if a face is set to show multiple texture ↵Monroe Linden
repeats, only one of the repeats is interactive) Added LLViewerMediaImpl::scaleTextureCoords() function to encapsulate the code that maps from texture coordinates to media coordinates. Made scaleTextureCoords() wrap the texture coordinate to the range [0.0, 1.0) before converting to media coordinates.