Commit Graph

3974 Commits (3d463ec43ee87faa05281e1a62dee002b4ec6c61)

Author SHA1 Message Date
Nat Goodspeed 3d463ec43e Work around Linux viewer test program catch failure 2009-12-03 13:51:44 -08:00
Nat Goodspeed 18901432e9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 11:51:50 -08:00
Eric M. Tulla (BigPapi) ed0596cfc7 merge of avatar-pipeline branch into viewer2 2009-12-03 13:58:14 -05:00
Nat Goodspeed d805fab31e DEV-43463: swap visit_and_connect() overloads for Linux compiler 2009-12-03 10:01:23 -08:00
skolb 1de537d1bd Fixed broken build 2009-12-03 09:43:50 -08:00
skolb 7851819c88 local merge 2009-12-03 09:18:11 -08:00
Nat Goodspeed 5fd2938da8 Merge with recent viewer-2-0 2009-12-03 09:17:51 -08:00
Nat Goodspeed 97f97f286c Skip logging test that fails on Linux, no idea why 2009-12-03 09:14:17 -08:00
Eric M. Tulla (BigPapi) b05ebd8977 merge of viewer2 into avp branch
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
Nat Goodspeed 57b68d9bfe Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TEST 2009-12-03 12:00:20 -05:00
Nat Goodspeed 1b8b6830b7 Reconcile llsdutil_tut.cpp with Kent's LLSD API change 2009-12-03 11:58:38 -05:00
bea@american.lindenlab.com 9b17e6710b merge 2009-12-03 08:49:08 -08:00
bea@american.lindenlab.com db4ea92fa8 merge 2009-12-03 08:48:47 -08:00
bea@american.lindenlab.com 1973cdc4e6 Add Doxygen comments 2009-12-03 08:47:59 -08:00
Nyx (Neal Orman) 0cfc3af9ac fixing bad cast that was causing a compiler error.
Code reviewed by Seraph

--HG--
branch : avatar-pipeline
2009-12-03 10:45:55 -05:00
Nat Goodspeed 91dd8b2371 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-03 10:38:26 -05:00
skolb 469f17f9c2 local merge 2009-12-02 18:20:27 -08:00
skolb 178c04f160 removed the unused AutoPlayMedia flag. This is now governed by the ParcelMediaAutoPlayEnable flag. 2009-12-02 18:19:14 -08:00
skolb 533988ee86 unify the two media auto play preferences into one. The ParcelMediaAutoPlayEnable flag now controls both (horribly named, but must be preserved for legacy purposes). 2009-12-02 18:12:30 -08:00
Monroe Linden 44d5fcb776 Changed the behavior of LLViewerMediaImpl::setDisabled() to interact more 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-02 17:34:27 -08:00
skolb 4e0706f641 Cleaned up the conditional code a bit in llviewerkeyboard.cpp, start_gesture 2009-12-02 17:10:21 -08:00
skolb 050b8ba205 DEV-42150 crash when using media on a HUD 2009-12-02 16:55:45 -08:00
Loren Shih 9841edf0f4 EXT-3060 : Turn links into broken links immediately when baseobj is purged
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-02 18:31:01 -05:00
Loren Shih 4b5849b6c0 EXT-3060 : Turn links into broken links immediately when baseobj is purged
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-02 16:12:39 -05:00
Rick Pasetto b5fa4a6d0d Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-12-02 12:17:45 -08:00
Rick Pasetto 4c3d08b665 Minor changes from review feedback
get rid of thunk function
2009-12-02 12:16:49 -08:00
Loren Shih 99b6b14ea1 EXT-3050 : The Word "bar" Should be Removed from Section Headings on My Appearance Tab in Side Bar
--HG--
branch : avatar-pipeline
2009-12-02 14:23:35 -05:00
Loren Shih c09b2bd9c9 EXT-3057 : Refine the context options that exist for broken links
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-02 14:16:07 -05:00
skolb 6d3ca60f31 Merge viewer 2.0 into media branch 2009-12-02 10:42:55 -08:00
Eric M. Tulla (BigPapi) 6e1f6f0153 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-02 12:52:36 -05:00
Runitai 8bd90b49b1 EXT-2737 Fix for terrain/avatars/trees not showing up in water reflection. 2009-12-02 11:46:14 -06:00
Nat Goodspeed 51c91a86e6 DEV-43463: update Boost for linux, linux64 too 2009-12-02 09:32:13 -08:00
Loren Shih d629be01cb Automated merge avp->avp
--HG--
branch : avatar-pipeline
2009-12-02 12:16:24 -05:00
Nat Goodspeed b626783d14 DEV-43463: update Boost package with fix for stack corruption bug 2009-12-02 12:15:52 -05:00
Loren Shih bbe2bcf8a2 EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, llviewermessage
More header file cleanup.

--HG--
branch : avatar-pipeline
2009-12-02 12:15:31 -05:00
Loren Shih 6c939da555 EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, llviewermessage
More header file cleanup.

--HG--
branch : avatar-pipeline
2009-12-02 12:13:08 -05:00
Loren Shih e24617a974 EXT 3046 : INFRASTRUCTURE: Header file includes cleanup for llviewermenu, llviewermessage
Removed > 100 header includes from llviewermenu and llviewermessage.

--HG--
branch : avatar-pipeline
2009-12-02 12:04:31 -05:00
Loren Shih 74f080ed31 EXT-3028 : "Find Original" does nothing if floater inventory isn't open
InventorySP will open if no inventory floaters are open.

--HG--
branch : avatar-pipeline
2009-12-02 12:02:47 -05:00
Eric M. Tulla (BigPapi) 6c9ff392bc Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-02 11:47:56 -05:00
Nyx (Neal Orman) c40ed43535 merging in viewer-2 into avp
--HG--
branch : avatar-pipeline
2009-12-02 11:29:03 -05:00
callum 9ad99e1773 Fix a signed/unsigned warning that breaks the Windows build. 2009-12-01 19:19:41 -08:00
bea@american.lindenlab.com 916720dd11 merge 2009-12-01 18:50:53 -08:00
bea@american.lindenlab.com 9026ac3264 Add Doxygen comments 2009-12-01 18:47:36 -08:00
Rick Pasetto b92fe4351c Automated merge with ssh://rick@hg.lindenlab.com/skolb/media 2009-12-01 18:45:40 -08:00
Monroe Linden 1db0d32133 Partial fix for EXT-2904/DEV-43584 (Space bar and Enter/Return key don't 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-01 18:27:09 -08:00
Loren Shih 8fdd2e0b28 EXT-3028 : "Find Original" does nothing if floater inventory isn't open
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-01 21:12:34 -05:00
skolb 96fa076a05 Merge 2009-12-01 18:12:16 -08:00
skolb fc56add793 EXT-3033 Streaming audio is completely broken in Viewer 2.0 2009-12-01 18:10:45 -08:00
Kent Quirk f496c2b164 DEV-43622 : API change (no functionality change) to fix a design error in LLSD
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-01 20:59:08 -05:00
Loren Shih f62ea011ea EXT-3028 : "Find Original" does nothing if floater inventory isn't open
Preliminary checkin, includes cleanup for llinventorypanel.
Also removed several unused private classes and such from llinventorypanel.

--HG--
branch : avatar-pipeline
2009-12-01 20:21:54 -05:00