daef055db9
Add log warning if media cap is missing
2009-11-20 16:26:43 -08:00
3bb86f91bc
Clean up some logging
2009-11-20 14:01:49 -08:00
95ca60cafe
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 13:12:50 -08:00
766af6102e
DEV-41991 DEV-42756 : un-do the "fix" for the race condition regarding media data overwriting.
...
I think the problem is that this floater's state is not updated
properly when the server response comes in. This needs more thought.
2009-11-20 13:11:39 -08:00
1c57d96aa7
Delete the media impl instead of just unloading it. From Review #41 feedback.
2009-11-20 13:09:39 -08:00
fa43b6ca0b
merging heads again >:(
2009-11-20 20:39:50 +00:00
dd3c7a1a25
Fix for errors with integration tests failing to find libcrypto.so.0.9.7
2009-11-20 15:35:19 -05:00
555c1203ef
Merge
2009-11-20 12:30:17 -08:00
9f00a7f381
Merging heads, hmm.
2009-11-20 20:03:51 +00:00
280a321867
Merge
...
--HG--
branch : product-engine
2009-11-20 11:40:11 -08:00
f80b5ea361
DEV-42556 Viewer Preference for Parcel media cannot be enabled/disabled
2009-11-20 11:36:18 -08:00
172cba3c42
Added two more procedurally created dirs to .hgignore to reduce the clutter of an hg status
2009-11-20 11:21:24 -08:00
75138ddfb2
Fix main loop to llerrs on memory alloc failure, was masked by misuse of LLFLoaterReg with LLFloaterMemLeak.
...
Reviewed with Bao
2009-11-20 10:46:58 -08:00
6016ac6588
EXT-2618 Added code to determine if the viewer is running 'compatibility mode'
...
OS version string reports compatibility mode and real os version number, if accessible.
reviewed by Richard
2009-11-20 10:09:22 -08:00
8bde51b92f
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 09:44:58 -08:00
a8b603f33e
Push the policy that "back", "forward" and "stop" do different things out of LLViewerMedia.
...
Now, LLViewerMedia has explicit skipBack() and skipForward()
functions, and the buttons in LLPanelPrimMediaControls now map
onto those functions neatly.
2009-11-19 18:34:37 -08:00
98d54377f9
Make time-based media "forward" and "back" different from navigate forward and navigate back
2009-11-19 16:47:29 -08:00
ba3f7965e3
Made LLMediaDataClient not send requests on behalf of objects that are marked as dead.
...
When LLMediaDataClient::QueueTimer::tick() encounters an object at the head of the queue that's dead, it will now remove that object and loop, instead of sending a request and waiting for the tick timer to fire again.
Added an isDead() function to LLMediaDataClientObject, and an additional unit test that verifies the handling of dead objects.
2009-11-19 16:35:11 -08:00
320dfa1d72
Added LLVOVolume::markDead(), which unhooks any prim media instances from the dead object.
2009-11-19 15:01:27 -08:00
7be953512a
fix for disappearing scrollbar in im windows
2009-11-19 14:31:00 -08:00
1919ecf38b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-19 11:41:42 -08:00
420661de5d
merge
2009-11-19 13:13:33 -05:00
d974ad3934
EXT-2562 : Somehow show cnotents of what I'm wearing
...
Added appearanceSP button to toggle folder closed/open state.
Also fixed up some bugs with current outfit title placement in appearanceSP.xml
Also added a generic call for getting the current outfit folder link
2009-11-19 12:06:26 -05:00
3e46ee6274
Fix "Global Illumintation" typo in the menu text which was bugging me.
2009-11-19 14:22:08 +00:00
884a9887a7
Changes to IM Logging, includes preference changes
2009-11-18 21:42:27 -08:00
7803ba8e0c
merge
2009-11-18 18:11:03 -08:00
5acb165025
Change close behavior to not end session.
...
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
2009-11-18 18:08:59 -08:00
ff6eea998d
Change close behavior to not end session.
...
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
Also made the group IM floater a little less broken.
2009-11-18 18:08:32 -08:00
5b2c91598d
EXT-2636 : No "fetching inventory" or other indication that inventory is loading.
2009-11-18 21:07:49 -05:00
699eac4ee3
Switch some files to Unix line endings
2009-11-18 17:52:03 -08:00
003cac41bc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-18 18:16:57 -05:00
3375a71ffb
merge
2009-11-18 15:09:17 -08:00
81eca4a782
merge
2009-11-18 15:05:04 -08:00
7bca43582e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-18 17:59:42 -05:00
061b8d3aa6
EXT-1916 : Places: Landmarks are not sorted in the Favorites Bar Accordion
2009-11-18 17:58:09 -05:00
a05f63b989
EXT-2638 Add Close X to IM and Chat log windows
2009-11-18 14:43:30 -08:00
2878328bb7
Renamed "close" to "end" in chiclet context menus
...
Removed "open" in chiclet context menus
Removed some deprecate "..."
Removed ^M from menu_viewer.xml
2009-11-18 14:39:51 -08:00
5649faf6d9
merge
2009-11-18 14:33:09 -08:00
5fce305bc6
merge
2009-11-18 14:30:05 -08:00
de23a4d92c
Merge
2009-11-18 14:29:39 -08:00
203490e2a0
Change /me emote formatting to pure italics, not underlined.
...
Review pending with Richard/Leyla
2009-11-18 14:29:01 -08:00
a46794bcff
EXT-2579 Fix memory leak/bloat due to /me IRC-style emotes.
...
Pending review with Richard/Leyla
2009-11-18 14:27:58 -08:00
dd9f2ca5f5
Merge from product-engine
2009-11-18 14:24:41 -08:00
fb81795a2d
merge
2009-11-18 17:20:03 -05:00
3716d1bcf8
merge
2009-11-18 14:15:20 -08:00
ce80f253e5
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-18 17:10:34 -05:00
51d5005fa3
Make failure to load lleventhost.dll when requested a fatal error.
...
This addresses a failure mode Mani encountered when lleventhost.dll wasn't
built. testlangs.py couldn't talk to the newly-launched viewer -- but thinking
that was because it had crashed, it went ahead and launched a whole bunch
more. This fix avoids the possibility of rogue viewer processes on an
unattended test machine.
2009-11-18 17:07:37 -05:00
efb512dc65
EXT-2644 - Add "Close Session" option to chicklet context menus
2009-11-18 14:07:35 -08:00
4a38c90adb
EXT-2641 : Linked gestures aren't showing up as being worn (and possibly more serious problems with linked gestures)
...
Gestures now properly handle link indirection.
2009-11-18 17:03:17 -05:00
becfbd2b82
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-18 13:06:28 -08:00
Rick Pasetto