ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
cd8e0b92e1
Tweak to ensure more avatar rendering info is sent to the simulator
2013-05-09 11:10:13 -07:00
d8f00dd1d1
MAINT-2665 FIX Crashes not being reported in some cases
...
made marker file lock use append, not truncate
2013-05-09 10:54:32 -07:00
0e93223aeb
Added tag 3.5.2-beta3 for changeset b6a4ac8f1916
2013-05-07 19:03:04 -04:00
545e033d1e
merge changes for DRTVWR-299
2013-05-07 15:11:55 -04:00
0f3d291ef6
tag merge of DRTVWR-299
2013-05-07 15:11:29 -04:00
f382233fbb
merge changes for DRTVWR-315
2013-05-07 13:38:39 -04:00
e921e51c18
tag merge of DRTVWR-315
2013-05-07 13:38:36 -04:00
f864a0b562
tag merge of DRTVWR-316
2013-05-07 13:38:07 -04:00
9707f09fd8
MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()
2013-05-06 15:01:13 -07:00
2a59fef6be
Merge. Pull from /lindenlab/viewer-cat prior to push.
2013-05-06 13:01:56 -04:00
f5e8457e4e
BUG-2295/MAINT-2624 unexpected crash around Content-Range: header processing
...
Not certain what the source of the short data is with one resident but I'm
going to make these problems retryable as they are transport-related. Lift
the retry detection into a method that should be reusable by others interested
in determining what is retryable. Trace output handling on the libcurl debug
callback was attrocious. Some unsafe length handling on my part was protected
by a second layer of defense. Made that correct and more useful by logging
actual data sizes during trace.
2013-05-06 12:12:05 -04:00
50cee8d660
MAINT-2655: "Block button in permissions dialog prompt does not block object"
...
* Fix mute button.
2013-05-03 21:58:19 +00:00
06f9f7b2d9
merge
2013-05-03 21:48:17 +00:00
8d0d645cd6
MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
...
* Switch mute to use task id.
reviewed with Simon
2013-05-03 12:53:37 -07:00
45a44225f5
MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
...
* Change text of dialog
* Add callback for mute button
reviewed with Richard and Widely.
2013-05-03 00:58:55 +00:00
291b387178
Cmake doesn't like me
2013-05-02 15:36:26 -07:00
299433c544
Fix the cmake fix
2013-05-02 15:13:05 -07:00
88ae31a3ad
Fix line endings
2013-05-02 13:31:21 -07:00
348d4b6680
Manually pull in Richard's fixes for llcommon/llsingleton.h
2013-05-01 14:44:09 -07:00
06f5872741
Added tag 3.5.2-beta2 for changeset 509b97acc4ca
2013-05-01 09:02:09 -04:00
cce8d02766
MAINT-2629: limit stream searches to prevent hangs on bad streams
2013-05-01 07:27:59 -04:00
474905bade
MAINT-2646 Viewer should neither grant nor display prompts for unimplemented LSL permissions
...
* Add the newer run time permissions to the viewer
* Filter requested permissions by those the viewer knows about
* Show a dialog indicating unknown permissions were requested and a new viewer
will be needed to grant them.
reviewed with Simon and Soft
2013-04-30 16:04:41 -07:00
5d50e2d02d
MAINT-2640 Fix for Wrong name of the checkbox Pathfinding view/test floater.
2013-04-30 11:27:08 -07:00
2bcc75470d
Override default channel from buildscripts project
2013-04-30 14:19:34 -04:00
cf37c67764
Merge downstream code from viewer-bear
2013-04-30 10:02:05 -07:00
889d02b52d
merge changes for CHOP-913
2013-04-30 08:57:29 -04:00
35f7a75083
Merge in downstream code from viewer-beta
2013-04-29 15:12:54 -07:00
f9850aa5d2
BUG-2295/MAINT-2624 [FIXED] Crash in HttpOpRequest::stageFromActive w/ Content-Range
...
Don't rely on a response body being present should a
Content-Range header be parsed. Unit tests captured
the original crash and confirm the fix.
2013-04-29 17:09:13 -04:00
5af5b49a62
Merge in downstream viewer-beta
2013-04-29 12:05:44 -07:00
ca7de31a6c
MAINT-2613: remove duplicate entry for "DisablePrecacheDelayAfterTeleporting", and fix a few other llsd validity problems
2013-04-29 14:34:29 -04:00
c040839ef0
pull tag for 3.5.1-release
2013-04-30 08:52:54 -04:00
39638b0de3
Convert LLThreadSafeRefCount back to atomic ref counting. Reviewed by Kelly
2013-04-26 15:54:03 -07:00
b49f6e1e74
Clean up LLSingleton work - special case to re-create instance if it's been deleted.
2013-04-25 16:21:32 -07:00
2ef8fc41e7
Added tag 3.5.2-beta1 for changeset 106f19cc011a
2013-04-25 18:47:28 -04:00
1beb15c93b
Added tag 3.5.1-release for changeset 13149a524874
2013-04-25 17:59:45 -04:00
6e483af1f6
Revert ares and libcurl version update that was causing problems, revise curl
...
handle duplication code. Reviewed by Kelly
2013-04-25 14:14:35 -07:00
c822d0ec9f
increment viewer version number to 3.5.2 (in new file)
2013-04-25 17:03:49 -04:00
8453b202b8
merge changes for latest viewer-development
2013-04-25 17:03:07 -04:00
c4a45fca39
Enhance "duplicate seed caps" log message ... this needs more investigation.
...
Reviewed by Kelly
2013-04-25 11:05:06 -07:00
7cb2f4f358
Remove an un-needed LL_CHECK_MEMORY check
2013-04-24 16:02:12 -07:00
2dc4f8f8e9
merge changes for DRTVWR-309
2013-04-24 18:52:59 -04:00
f89d1c9665
tag merge of DRTVWR-309
2013-04-24 18:49:27 -04:00
cc3361352d
Follow-up code cleaning for LLToast work trying to get branch healthy.
...
Reviewed by Kelly
2013-04-24 15:34:18 -07:00
774277e9cf
FIX INTL-114 translation for 9 languages of major update from CHUI (based on latest merge with viewer-development)
2013-04-24 13:56:53 -07:00
80772aa1ad
sync with viewer-development (per DRTVWR-309)
2013-04-24 13:49:11 -07:00
faf844ff99
Trivial change to note that earlier changeset 27742 (1c3262183eb5) is a
...
re-work of the LLInstanceTracker code done by Richard. The commit comment
is cryptic
2013-04-24 10:59:25 -07:00
cbd3f4b997
Fix crash discovered during other testing. Reviewed by Kelly
2013-04-24 10:24:42 -07:00
simon