Commit Graph

107 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Logan Dethrow cfd35b8b22 Made a bug that was masking the warning about mismatched caps coming from a region. They could never match because certain capabilities are explicitly not stored when we receive them.
* Made mSecondCapabilitiesTracker set capabilities in a way that more closely matches mCapabilities so that they will match up when we get a second cap grant from a region if the caps that were sent are actually the same.
* Added more logging around setting a region's seed capability.
* Also added a static function in llviewerregion to dump out a CapabilityMap based on the logActiveCapabilities method. Defined the old method in terms of the new static free function.
2013-03-28 18:07:54 -04:00
Mnikolenko ProductEngine f8e43b6f66 CHUI-765 FIXED User's name is added to the list in Nearby tab. 2013-02-13 15:08:49 +02:00
simon@Simon-PC.lindenlab.com 7e6ccbc01d MAINT-1042: Blocking asset avatar prevents future uploads. Reviewed by Kelly. 2012-07-25 15:46:15 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks 99dc246ac8 Merge 2012-06-15 14:29:46 -05:00
Dave Parks 9605da154e merge 2012-06-13 18:06:49 -05:00
Dave Parks b93a23aa82 MAINT-1147 Fix for frame stall on region crossing. 2012-06-13 18:05:56 -05:00
simon@Simon-PC.lindenlab.com c559e3d6b9 MAINT-1161: non standard sea level not correctly rendered around private islands.
Reviewed by Kelly
2012-06-12 18:26:23 -07:00
Seth ProductEngine 784ec58401 MAINT-813 FIXED crash when trying to access the region info after viewer disconnect.
Added checks for LLViewerRegion pointer in LLViewerObject being invalid.
2012-04-26 00:40:42 +03:00
Nat Goodspeed 0249a0d1e7 Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:07:09 -04:00
Xiaohong Bao a98516c95e for MAINT-682: revert of changeset e63e7b0a4317: fix for SH-2668: "ocean" water is always 20m high instead of the Region Water Height 2012-03-08 18:18:01 -07:00
Jonathan Yap 21f3634d29 STORM-1793 Fix dumb syntax error 2012-02-06 18:00:18 -05:00
Jonathan Yap acb1df8b85 STORM-1793 Fix another logic error in getAvatars 2012-02-03 11:48:00 -05:00
Jonathan Yap f106ef8383 STORM-1793 Fix bad assumption in getAvatars 2012-02-03 09:02:01 -05:00
Jonathan Yap 3b2511661e STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy
With help from Aleric Inglewood
2012-01-27 08:33:26 -05:00
Xiaohong Bao e6f5a57395 fix for SH-2668: "ocean" water is always 20m high instead of the Region Water Height 2011-11-30 11:21:22 -07:00
Dave Parks 34c01b6b1f SH-2564 Fix for bad frustum culling on visible region list 2011-10-20 18:53:12 -05:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Oz Linden 156e72fc19 correct merge errors 2011-05-26 21:40:16 -04:00
Oz Linden 42b967e8a1 merge changes for oz windlight issues 2011-05-26 20:30:33 -04:00
Oz Linden 0eb13bb682 storm-1189: remove more of the code for classic clouds 2011-05-26 11:30:39 -04:00
Oz Linden fb9ef62331 storm-1189: remove classic clouds 2011-05-26 06:31:11 -04:00
Oz Linden 0f02f6784d storm-1189: remove classic clouds 2011-05-25 13:57:16 -04:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
Xiaohong Bao cce2a3b7a4 release memory held by LLWorld when destroy it. 2011-05-10 21:04:41 -06: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
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Ricky Curtice 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
Oz Linden 60bceb759b merge changes for storm-954 2011-04-10 22:39:31 -04:00
Oz Linden b5c834c6fd merge changes for STORM-1051 2011-04-05 07:23:43 -04:00
Twisted Laws twisted_laws@hotmail.com c9c192e2c4 Storm 954 - corrected use of braces 2011-03-31 16:46:25 -04:00
Ricky Curtice 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
Twisted Laws twisted_laws@hotmail.com 03c9c4da84 STORM-954 patch correction 2011-03-09 17:59:59 -05:00
Xiaohong Bao 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
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -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
Twisted Laws e3f075f775 STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 meters 2011-02-15 14:13:43 -05:00
Loren Shih e3ed1565f8 Automated merge up from viewer-development into mesh-development 2011-02-10 10:44:21 -05:00
Dave Parks 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
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 bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Loren Shih a5e63b1dc0 Merge 2010-11-08 12:57:26 -05:00
Dave SIMmONs 447dc782fd Merge latest from lindenlab/viewer-development 2010-11-05 13:30:20 -07:00
Loren Shih 639bb11eef Automated merge from viewer-development-shining 2010-10-27 16:19:18 -04:00
Loren Shih 225ffbba20 Automated merge up from viewer-development 2010-10-27 15:08:21 -04:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00