Roxie Linden
37a3b0d753
Remove ObjectAdd cap, no longer needed
2011-06-09 14:30:53 -07:00
Dave Parks
f1784209d5
merge
2011-06-07 14:42:54 -05:00
Dave Parks
690f18c948
merge
2011-06-07 13:59:40 -05:00
Dave Parks
faf9693be3
Make basehull assert even more forgiving (only error out on 10% over bounds).
2011-06-07 00:10:24 -05:00
Dave Parks
b3fbb12f15
SH-1589 Fix for some meshes showing up in non mesh enabled regions.
2011-06-06 19:12:52 -05:00
Roxie Linden
c24a5a3fb5
automated merge
2011-06-06 15:35:52 -07:00
Don Kjer
325c2b2169
Removed the old mesh asset upload pipeline. Fixed a problem with spamming MissingString MacLocale warnings. Reviewed by Dave
2011-06-06 21:27:29 +00:00
Roxie Linden
bc014c2e9e
automated merge
2011-06-03 14:34:00 -07:00
Roxie Linden
31e850d048
transplant fix for SH-1467
...
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
2011-05-27 11:50:39 -07:00
prep
8e728befa5
Sh-1647: Accounting caps update
2011-05-25 15:57:12 -04:00
prep linden
f15b6396ec
Added NewAccountingEnabled cap
2011-05-20 15:45:09 -04:00
prep linden
0b612741d5
SH-1252 and SH-1253 WIP.
2011-05-20 14:26:05 -04:00
Dave Parks
8ae550996c
Merge cleanup.
2011-05-16 13:48:55 -05:00
Dave Parks
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
brad kittenbrink
dbc92691a6
Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies.
2011-05-05 17:13:52 -07:00
Richard Linden
1d34e7b90b
Automated merge with http://hg.secondlife.com/viewer-development
2011-04-06 15:20:51 -07:00
Oz Linden
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
callum
b286a9091b
SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
...
Also fixes SOCIAL-521 and SOCIAL-428
2011-03-25 13:56:14 -07:00
Leyla Farazha
e342c522b4
Fixed ghosting issue on non-UseHTTPInventory case
2011-03-11 14:32:26 -08:00
Dave Parks
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
Loren Shih
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
Don Kjer
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
Loren Shih
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
Xiaohong Bao
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
Loren Shih
d82da834fa
Automated merge up from viewer-development
2011-01-14 14:16:07 -05:00
Loren Shih
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
Aaron Stone
40cd537054
Switch inventory capabilities to FetchInventory2 and family.
2011-01-07 18:30:03 +00:00
Don Kjer
756a4e26da
Merge with viewer-development
2011-01-12 19:00:36 -08:00
Don Kjer
0f5d8e53ca
Merge with viewer-development
2010-12-22 14:24:28 -08:00
Don Kjer
649dd6eb74
Cleanup from review with Andrew and Merov
2010-12-22 14:23:35 -08:00
Andrew Meadows
bf20d1498b
merge
2010-12-22 10:28:16 -08:00
Andrew Meadows
740bd8dbfd
merge
2010-12-22 09:54:45 -08:00
Loren Shih
4e98895719
Automated merge up from viewer-development
2010-12-21 10:39:35 -05:00
Andrew Meadows
7fc9d70119
For object-vs-parcel overlap we now use list of axis aligned boxes
...
one box for each prim, for less slop on queries
2010-12-17 19:52:45 -08:00
Andrew Meadows
bcc8351eb1
merge
2010-12-15 08:03:49 -08:00
Xiaohong Bao
da244c7cce
a try fix for SH-212: crash at LLViewerObjectList::removeFromLocalIDTable(LLViewerObject const &) [secondlife-bin llviewerobjectlist.cpp] line 173
2010-12-14 12:16:39 -07:00
Don Kjer
b71b9ee08e
Added object update cache results to viewer stats recorder
2010-12-13 16:15:25 -08:00
Don Kjer
f4884faf3a
Expanded viewer stats recorder to include cache miss type, cache miss requests, and update failures
2010-12-13 12:33:19 -08:00
Andrew Meadows
e040f16a4f
merge
2010-12-10 10:40:38 -08:00
Monty Brandenberg
b9cf73c29b
merge from http://hg.secondlife.com/viewer-development
2010-12-09 11:07:50 -05:00
Andrew Meadows
dd8e387d66
ER-343 viewer UI does not correctly enable/disable object return
...
The problem: a misunderstanding of what LLViewerParcelOverlay::isOwned() means.
2010-12-06 15:47:35 -08:00
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Monty Brandenberg
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
Monty Brandenberg
0fd80d0997
ESC-154 ESC-156 Metrics integration across threads
...
Using unpause() method in derived class rather than wake() in furthest base class
solved the stalling problem. I still think too many levels of the
LLTextureFetch hierarchy are keeping thread state, however. The
LLViewerRegion instance an agent enters doesn't necessarily have its
region_id yet, that only comes after the handshake, if any. So add
a few more metrics insertion points to propagate region into metrics.
Finally, try to launch a final metrics report when a quit is initiated.
2010-11-24 16:46:40 -05:00
Andrew Meadows
424786d8d0
Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
...
Reviewed with Falcon
2010-11-18 15:55:53 -08:00
Monty Brandenberg
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
Andrew Meadows
807007649a
merge
2010-11-16 07:01:11 -08:00
Kyle Ambroff
fa17864382
Merge with lindenlab/viewer-development
2010-10-29 19:52:01 -07:00
Loren Shih
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
Merov Linden
ebce1a4ea8
STORM-416 : merge with viewer-development
2010-10-26 10:59:37 -07:00