a25f898703
merge
2011-05-02 14:52:12 -05:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
764412f9b5
merge
2011-04-22 11:50:19 -05:00
9bac314ba0
Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review.
2011-03-12 23:39:10 -08:00
d4d292258e
Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
...
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
5cf5e4bb88
merge
2011-04-19 16:35:37 -05:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
64e017fc6b
SH-915 WIP - allow flycam control in autopilot record/playback
2011-02-09 15:04:25 -05:00
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
61e3c95dbf
Automated merge up from viewer-development
2011-01-07 10:14:33 -05:00
376ee7a3f9
STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names.
...
- Added parcel info observer to LLUrlEntryParcel.
- Added notifying LLUrlEntryParcel by LLRemoteParcelInfoProcessor when parcel data arrives.
- Added notifying LLUrlEntryParcel about user login, changing host and viewer connection state to use this data in remote parcel requests.
2010-12-30 18:18:33 +02:00
f1fd558ddd
STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to mouselook mode
...
- After switching to the mouse look mode hide control bar immediately, not fading it with timer
- Added signal for switching mouse look mode out just for convenience. It's not used in this fix.
2010-12-28 19:02:49 +02:00
4e98895719
Automated merge up from viewer-development
2010-12-21 10:39:35 -05:00
b9cf73c29b
merge from http://hg.secondlife.com/viewer-development
2010-12-09 11:07:50 -05:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
0f2ed092c5
ESC-154 ESC-156 Now using region hash rather than region uuid as identifier.
...
In the viewer, the region's UUID is acquired very late and isn't generally
used as the canonical region identifier. The U64 region hash is a better
and more consistently used identifier so I'm moving over to using that as
the region key. Don't have a proper reserved invalid region hash which is
unfortunate, but then, so much is.
2010-11-29 08:31:08 -08:00
90f496b302
STORM-461 FIXED Hide sidebar tab buttons in mouselook mode.
2010-11-22 16:09:33 +02:00
066d8c39ca
Automated merge with file:///Users/Bill/Projects/viewer-release
2010-11-19 14:11:42 -08:00
d666a3d92c
ESC-154 ESC-155 ESC-156
...
Asset fetch requests wrapped to allow for measurements.
Asset fetch enqueues, dequeues and completion times recorded
to asset stats collector. Texture fetch operations (http
and udp) recorded to asset stats collector. Stats collector
time vallue switched from F32 to U64 which is the more common
type in the viewer. Cross-thread mechanism introduced to
communicate region changes and generate global statistics
messages. Facility to deliver metrics via Capabilities
sketched in but needs additional work. Documentation and
diagrams added.
2010-11-18 08:43:09 -08:00
3fa059409a
changes to read max-agent-groups from login.cgi response
2010-11-08 10:54:58 -08:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
e68f9e566b
merge
2010-08-31 16:37:40 -05:00
7c0a6df30a
EXP-60 FIX not showing after Re-enabling Hints in same session
2010-09-20 16:21:00 -07:00
1911993cc7
merge
2010-09-16 19:45:57 -07:00
b1c677a6e7
Merge
2010-08-28 16:03:53 +01:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
dbe965eaa1
Sync with viewer-development
2010-08-26 21:45:20 -07:00
34a063ae5a
VWR-20715 Double-click teleport
...
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2
By Twisted Laws and Thickbrick Sleaford
2010-08-26 16:49:41 +01:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
5361e6826f
VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patch
2010-08-25 10:58:49 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
c20bd2dfee
cleaned up LLUICtrlFactory...
...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
187c229aca
fix for hints reappearing even after criteria passed
2010-08-13 12:21:28 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
e5cfdd1cb8
fixed move hint always showing up immediately
2010-08-12 15:26:53 -07:00
2c999688c4
added remaining hints and fade in/fade out behavior
2010-08-12 15:18:25 -07:00
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
19c0d6d4ea
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
2010-07-30 10:11:55 -04:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
75cfa9a0c3
EXT-8051 FIXED Change cameraCustomizeAvatar calls to use gAvatarp->isUsingBakedTextures
...
Changed some uses of cameraCustomizeAvatar as appropriate.
2010-07-22 15:06:08 -04:00
44d0fd81ee
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
7ac8658c77
(hairy) merge from viewer-release
2010-07-26 10:34:39 +01:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
f65a95157a
merge from PE's viewer-trunk (viewer-public)
2010-07-15 08:54:55 +01:00
Dave Parks