d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
156e72fc19
correct merge errors
2011-05-26 21:40:16 -04:00
42b967e8a1
merge changes for oz windlight issues
2011-05-26 20:30:33 -04:00
0eb13bb682
storm-1189: remove more of the code for classic clouds
2011-05-26 11:30:39 -04:00
fb9ef62331
storm-1189: remove classic clouds
2011-05-26 06:31:11 -04:00
0f02f6784d
storm-1189: remove classic clouds
2011-05-25 13:57:16 -04:00
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
cce2a3b7a4
release memory held by LLWorld when destroy it.
2011-05-10 21:04:41 -06:00
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
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
60bceb759b
merge changes for storm-954
2011-04-10 22:39:31 -04:00
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
c9c192e2c4
Storm 954 - corrected use of braces
2011-03-31 16:46:25 -04: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
03c9c4da84
STORM-954 patch correction
2011-03-09 17:59:59 -05:00
409cc0cf93
fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion
...
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
2011-03-07 18:10:28 -07:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
8330a4d0fd
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
2011-02-19 00:17:12 +00: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
e3f075f775
STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 meters
2011-02-15 14:13:43 -05:00
e3ed1565f8
Automated merge up from viewer-development into mesh-development
2011-02-10 10:44:21 -05:00
10518eaaae
SH-874 Revert much of the bad water bounding box and distortion texture usage changes from SNOW-643 and properly occlusion cull void water patches for machines without depth clamp.
2011-02-09 16:53:47 -06:00
54cced2356
debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight
2011-02-09 10:33:07 -07:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
447dc782fd
Merge latest from lindenlab/viewer-development
2010-11-05 13:30:20 -07:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
58f0e78cb4
Initial work on viewer motion interpolation. Changes include:
...
* InterpolationTime and InterpolationPhaseOut values in settings.xml to control new object interpolation code. Use zero to revert to old logic
* Viewer motion interpolation lasts InterpolationTime and will start to phase out after InterpolationPhaseOut seconds
* Changed LLWorld::getMinAllowedZ() to take a world-position as a parameter
* Added LLVOAvatarSelf::resetRegionCrossingTimer()
* Actually reset LLVOAvatarSelf::mRegionCrossingTimer so we get sensible timing data for region crossings
* LLVOAvatarSelf::updateRegion() will update position value due to region changes
Code reviewed by Ambroff
*
2010-10-12 13:50:17 -07:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07: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
b5ea8b6046
for VWR-22936: design test code/plan for the object cache.
2010-09-13 12:39:14 -06:00
e29f811d56
code for DEV-52939: viewer's object geometry cache files are not limited in number, and can also be incorrectly cleared with the VFS cache.
...
reviewed by andrew.
2010-09-01 13:40:10 -06: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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
be6dc84b12
merge from viewer-public
2010-05-27 12:34:05 +01:00
617e961445
merge from viewer-public
2010-05-27 12:34:05 +01:00
f45f87e07d
Fixes for DEV-50619 Have the low graphics settings be the lowest possible settings for settings with slider bars and DEV-50618 Have Draw Classic Clouds be off for low graphics settings and DEV-50616 Toggling Draw Classic Clouds does not actually prevent them from being drawn if clouds have been drawn once. Reviewed by qarl
2010-05-26 15:43:28 -07:00
3d39634cbd
merge from viewer-public
2010-05-12 11:44:16 +01:00
df07ba176c
merge from viewer-public
2010-05-12 11:44:16 +01:00
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
Xiaohong Bao