Oz Linden
4ff281ab94
merge changes for storm-1436
2011-08-09 10:20:41 -04:00
Vadim ProductEngine
9bef7e95d0
STORM-1436 FIXED Broken localization of "Contents" and "New Script" items in the Contents tab of Build Tools.
...
The bug happened when the translations contained non-ASCII characters.
Reason: Names of inventory items are limited to ASCII characters.
Fix: Leave names in English, localize them when displaying (on the fly).
The fix only affects object's inventory (i.e. not agent inventory).
2011-07-29 05:20:54 +03:00
Brad Payne (Vir Linden)
8b7e33ad36
Cherry pick of https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions
2011-07-19 15:19:07 -04:00
Don Kjer
b9d6b5ef9a
Merge viewer-development -> mesh-development
2011-07-08 18:25:07 -07:00
Seth ProductEngine
74c5c0a0d7
SH-1945 FIXED Added a check for Estate Managership when checking whether an object encroaching on the region can be returned.
2011-07-06 20:05:38 +03:00
prep linden
e7c5913c05
Bug fixes for SH-1791
2011-06-24 15:21:50 -04:00
prep
0961c3baaa
WIP SH-1791 - constructAndAddReturnable() now accepts target region
2011-06-22 15:54:16 -04:00
prep linden
4caf151c5a
WIP for SH-1791
2011-06-22 13:36:21 -04:00
Oz Linden
13de92740e
merge latest viewer-development
2011-06-22 11:45:43 -04:00
Dave Parks
99b05f9647
Fix for show object updates not working (and crashing, and behaving badly).
2011-06-10 18:51:22 -05:00
Oz Linden
8bfd3201de
merge changes for latest viewer-development
2011-06-01 22:07:12 -04:00
Loren Shih
303a59e7bc
dos2unix fixes for newview files.
2011-05-26 14:16:56 -04:00
Oz Linden
0eb13bb682
storm-1189: remove more of the code for classic clouds
2011-05-26 11:30:39 -04:00
Dave Parks
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
Loren Shih
6f5313caea
automated merge mesh-development -> davep-mesh-candidate-2010
2011-05-20 14:56:10 -04:00
prep linden
0b612741d5
SH-1252 and SH-1253 WIP.
2011-05-20 14:26:05 -04:00
Loren Shih
f337f262ad
SH-1419 FIXED Sim complains about changing physical materials when Physics, Temporary, or Phantom is changed.
2011-05-17 10:57:56 -04:00
Loren Shih
781af27e9c
SH-1419 Sim complains about changing physical materials when Physics, Temporary, or Phantom is changed.
2011-05-09 13:49:20 -04:00
Dave Parks
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
Dave Parks
feccb5b84c
SH-1292 Add streaming and physics cost to stats console.
2011-04-07 19:18:02 -05:00
Dave Parks
844c3ec724
SH-477 Scene stats console work in progress.
2011-04-04 12:19:14 -05:00
Dave Parks
6b9a2d24cc
SH-477 Better mesh streaming cost estimation.
2011-03-30 18:38:22 -05:00
Don Kjer
8330a4d0fd
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
2011-02-19 00:17:12 +00: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
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
Merov Linden
b82f2c4e4d
pull from viewer-development
2011-02-09 15:10:26 -08:00
Xiaohong Bao
8d43cb2701
trivial: remove some redundant code.
2011-02-09 12:15:21 -07:00
Xiaohong Bao
54cced2356
debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight
2011-02-09 10:33:07 -07:00
Loren Shih
d0cba9e919
Automated merge up from viewer-development into mesh-development
2011-01-24 10:56:40 -05:00
Dave Parks
c1db849c41
SH-635 Fix for changing one physics parameter changing all physics parameters.
2011-01-20 15:50:03 -06:00
Dave SIMmONs
f91a9c87e5
ER-428 / CTS-422 : [PUBLIC] movement updates are lost when walking. Changed code to detect if the circuit has stopped getting packets. Reviewed by Andrew
2011-01-19 12:54:05 -08:00
Loren Shih
5364bb5a11
Mesh-development work in progress
2011-01-14 15:16:17 -05: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
Don Kjer
756a4e26da
Merge with viewer-development
2011-01-12 19:00:36 -08:00
Aleric Inglewood
9531046609
STORM-955: VWR-24312: Massively duplicated objects
...
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.
After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
Don Kjer
649dd6eb74
Cleanup from review with Andrew and Merov
2010-12-22 14:23:35 -08: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
Don Kjer
14e402cf5e
ER-414: Add object update type debug rendering view
2010-12-16 22:09:49 -08:00
Andrew Meadows
3be87bb046
ER-407 child bounding boxes not rotated properly for encroachment returnability
...
Using the correct method for joining BBoxes in the agent frame ::addBBoxAgent()
2010-12-15 11:23:00 -08:00
Andrew Meadows
64512b681e
ER-398 viewer's encroachment logic only uses bounding box of root prim
...
Adding LLBBox::join() to allow us to compute the bounding box of a linked object
2010-12-14 08:52:33 -08:00
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Andrew Meadows
c320b2cef9
Fixing a typo that broke the build.
2010-11-19 08:36:53 -08: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
Dave SIMmONs
b90614a6e7
ER-290 : New motion prediction in the viewer has avatars settle a bit too deeply underground when the simulator is paused, also no angular velocity damping.
...
Put Z limit on AVs, but not regular objects nor stopping rotation. Reviewed by Kelly.
2010-11-08 16:34:14 -08:00
Dave SIMmONs
447dc782fd
Merge latest from lindenlab/viewer-development
2010-11-05 13:30:20 -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
Dave Parks
1ca35bb30f
merge
2010-10-20 14:39:28 -05:00
Loren Shih
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00