bfe66526c8
Rewrote LLWindowMacOSX::handleDragNDrop() to use pasteboard manager instead of old, busted scrap manager to extract the data. Also fixed a mouse coordinate issue that caused drag tracking to be off.
2009-12-03 17:01:58 -08:00
ff53d4ff9b
Fix Windows build based on API change to handleDragNDrop()
2009-12-03 12:19:02 -08:00
0a2a52c3b1
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 11:55:43 -08:00
18901432e9
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 11:51:50 -08:00
57195ccd74
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum
2009-12-03 11:51:15 -08:00
c272582ab7
Change API to no longer include slurl argument (its a platform-agnostic policy), add some code (not working yet) to implement DND on the mac
2009-12-03 11:48:28 -08:00
ed0596cfc7
merge of avatar-pipeline branch into viewer2
2009-12-03 13:58:14 -05:00
d805fab31e
DEV-43463: swap visit_and_connect() overloads for Linux compiler
2009-12-03 10:01:23 -08:00
1de537d1bd
Fixed broken build
2009-12-03 09:43:50 -08:00
7851819c88
local merge
2009-12-03 09:18:11 -08:00
5fd2938da8
Merge with recent viewer-2-0
2009-12-03 09:17:51 -08:00
97f97f286c
Skip logging test that fails on Linux, no idea why
2009-12-03 09:14:17 -08:00
b05ebd8977
merge of viewer2 into avp branch
...
--HG--
branch : avatar-pipeline
2009-12-03 12:09:16 -05:00
57b68d9bfe
Resync indra/test's LD_LIBRARY_PATH with ADD_INTEGRATION_TEST
2009-12-03 12:00:20 -05:00
1b8b6830b7
Reconcile llsdutil_tut.cpp with Kent's LLSD API change
2009-12-03 11:58:38 -05:00
9b17e6710b
merge
2009-12-03 08:49:08 -08:00
db4ea92fa8
merge
2009-12-03 08:48:47 -08:00
1973cdc4e6
Add Doxygen comments
2009-12-03 08:47:59 -08:00
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
91dd8b2371
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 10:38:26 -05:00
469f17f9c2
local merge
2009-12-02 18:20:27 -08:00
178c04f160
removed the unused AutoPlayMedia flag. This is now governed by the ParcelMediaAutoPlayEnable flag.
2009-12-02 18:19:14 -08:00
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
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
4e0706f641
Cleaned up the conditional code a bit in llviewerkeyboard.cpp, start_gesture
2009-12-02 17:10:21 -08:00
050b8ba205
DEV-42150 crash when using media on a HUD
2009-12-02 16:55:45 -08:00
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
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
b5fa4a6d0d
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-02 12:17:45 -08:00
4c3d08b665
Minor changes from review feedback
...
get rid of thunk function
2009-12-02 12:16:49 -08:00
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
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
6d3ca60f31
Merge viewer 2.0 into media branch
2009-12-02 10:42:55 -08:00
6e1f6f0153
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-02 12:52:36 -05:00
8bd90b49b1
EXT-2737 Fix for terrain/avatars/trees not showing up in water reflection.
2009-12-02 11:46:14 -06:00
51c91a86e6
DEV-43463: update Boost for linux, linux64 too
2009-12-02 09:32:13 -08:00
d629be01cb
Automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-02 12:16:24 -05:00
b626783d14
DEV-43463: update Boost package with fix for stack corruption bug
2009-12-02 12:15:52 -05:00
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
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
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
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
6c9ff392bc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-02 11:47:56 -05:00
c40ed43535
merging in viewer-2 into avp
...
--HG--
branch : avatar-pipeline
2009-12-02 11:29:03 -05:00
9ad99e1773
Fix a signed/unsigned warning that breaks the Windows build.
2009-12-01 19:19:41 -08:00
916720dd11
merge
2009-12-01 18:50:53 -08:00
9026ac3264
Add Doxygen comments
2009-12-01 18:47:36 -08:00
b92fe4351c
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-01 18:45:40 -08:00
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
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
Monroe Linden