d801628cb4
automated merge
2010-06-15 17:12:42 -04:00
d2d95e9645
automated merge
2010-06-15 17:12:22 -04:00
79c4c1241b
Enable the call to LLQtWebKit::setWindowOpenBehavior() on Linux, since the llqtwebkit build has been updated.
2010-06-15 14:11:26 -07:00
0be5ce0a59
EXT-7468 FIXED Remove all 2.1 COF debugging code
...
#ifdef'd a bunch of llinfos spam to not show up in release mode. Removed some other legacy comments.
2010-06-15 17:11:01 -04:00
8294f69ea3
EXT-7651 FIXED Take out hack in isLocalTextureDataFinal for TextureDiscardLevels
...
Removed hack (this was just used for debugging avatar rez times).
2010-06-15 17:09:43 -04:00
050199e031
merge
2010-06-15 16:57:25 -04:00
3ce5e0e99d
EXT-6953 FIX - enable new walk/run by default
2010-06-15 16:56:51 -04:00
2b7188d614
merge
2010-06-15 13:54:06 -07:00
8b95793c35
EXT-6953 WIP fixed walk cycle foot slip feedback to not speed up animation so much
...
also, made camera default target and offset live-settable for debugging
reviewed by vir
2010-06-15 13:53:40 -07:00
f12aa928c5
EXT-7758 FIXED Take out "Change FolderType" for viewer2.1.
...
Change folder type is now keyed off of SUPPORT_ENSEMBLES versus being available in non-release viewers.
2010-06-15 15:56:54 -04:00
40133be7be
EXT-7829 FIXED Corrupted graphics in inventory side panel (gray box)
...
Took out ensemble folder icon use, replaced with default icons.
2010-06-15 15:56:46 -04:00
f8a8499c9d
merge
2010-06-15 15:01:08 -04:00
9b014886b0
merge
2010-06-15 14:36:32 -04:00
d6af2d0985
Fix for EXT-7414 (Jumping to a specific time in a video stream does not work in Viewer 2.)
...
This was a race condition. In the repro case, LLViewerMediaImpl::seek() was getting called before the media source got a chance to be loaded (since the load is now delayed at least 1 frame due to the priority calculations), so the seek command was being dropped.
The fix is to save the seek time in mPreviousMediaTime in this case, and rearrange the code in LLViewerMediaImpl::loadURI() so that it gets used whenever it's non-zero. I've also added similar code in LLViewerMediaImpl::pause() and LLViewerMediaImpl::start() to set mPreviousMediaState. (If there are any cases where content wants parcel media to start out paused, they would have had a similar issue.)
Reviewed by Callum and Richard at http://codereview.lindenlab.com/2478002 .
2010-06-15 10:53:02 -07:00
a37e6ce52e
merge
2010-06-15 10:25:47 -07:00
44f65edd68
merge
2010-06-15 12:53:56 -04:00
da078d9a35
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-06-15 17:28:33 +01:00
b2b6d52807
EXT-7851 FIXED Cleaned up code to avoid confusion.
...
The mTmpWriteBuffer member variable was never actually being allocated
because it was being shadowed by a local variable. This is why the
code never crashed. I've removed the member variable as it was clearly
never used and really confused the code.
2010-06-15 17:28:17 +01:00
85c14e4510
fix minor xml barf.
2010-06-15 15:53:04 +01:00
61a99e8ac6
merge backout
2010-06-15 15:40:56 +01:00
65d8872507
merge fix in unrelated file.
2010-06-15 15:35:47 +01:00
0b523e4027
Merge
2010-06-15 14:57:16 +01:00
d5ddb91a68
EXT-7524 FIXED Save snapshot to inventory results in crash
2010-06-15 14:55:46 +01:00
b9ea8cc0b5
final(?) merge to revert snapshot floater to 2.0.1 level.
2010-06-15 14:55:05 +01:00
9fd6bab430
Backed out changeset 1acc14a5e7ac
2010-06-15 14:51:03 +01:00
23b395b91d
merge backout.
2010-06-15 14:50:30 +01:00
e490d6974d
Backed out changeset 4206f9061a67
2010-06-15 14:50:15 +01:00
3819343f5a
Backed out changeset 6d51a12cb2d8 which accidentally included some unrelated work.
2010-06-15 14:49:55 +01:00
66caff142a
merge backout.
2010-06-15 14:49:55 +01:00
ea412a7377
Backed out changeset 388c6d09894a
2010-06-15 14:49:45 +01:00
90250cb36d
merge backout.
2010-06-15 14:49:26 +01:00
5ad91abfdf
Backed out changeset b447707f20f5
2010-06-15 14:49:16 +01:00
f8c91bad6b
merge backout.
2010-06-15 14:48:31 +01:00
f4b7164752
Backed out changeset 1c66b34b7fbe
2010-06-15 14:48:14 +01:00
472b7a94c0
merge backout.
2010-06-15 14:47:51 +01:00
565d177156
Backed out changeset c9dd9852d76b
2010-06-15 14:47:38 +01:00
ff4d30edf4
merge backout.
2010-06-15 14:46:01 +01:00
bc0b401359
Backed out changeset d632626f9b11
2010-06-15 14:45:51 +01:00
d5d3c85215
merge backout
2010-06-15 14:45:13 +01:00
4d852aba0e
Backed out changeset 688db499e2d1
2010-06-15 14:45:04 +01:00
a2cb781e59
merge backout
2010-06-15 14:43:31 +01:00
87e9828fc9
Backed out changeset ccbf22ff283c
2010-06-15 14:43:19 +01:00
3a651fe406
merge backout
2010-06-15 14:41:08 +01:00
b95bd0dc27
Backed out changeset 68feae2ef00a
2010-06-15 14:41:01 +01:00
10af942811
merge backout
2010-06-15 14:39:45 +01:00
0effcd8a9f
Backed out changeset fb6c9a1cebfc
2010-06-15 14:39:37 +01:00
597a26aca1
merge backout
2010-06-15 14:39:18 +01:00
c8dea8b6e5
Backed out changeset 2f4b18cc2bbf
2010-06-15 14:39:10 +01:00
44647bd3b1
merge reversion, leaving lldate intact.
2010-06-15 14:37:42 +01:00
10c722604a
Backed out changeset 6d51a12cb2d8
2010-06-15 14:35:21 +01:00
Loren Shih