Commit Graph

14863 Commits (2c0f97ea392e770cc459b7b7974e9adad2249c87)

Author SHA1 Message Date
Oz Linden 2c0f97ea39 pull 2.5.2-release tag back 2011-03-14 19:51:04 -04:00
Dessie Linden 6bf1bfb762 Added tag DRTVWR-38_2.5.2-release, 2.5.2-release for changeset b53a0576eec8 2011-03-14 16:06:11 -07:00
Oz Linden b7635b6112 pull transplanted crash fix changesets back from viewer-release 2011-03-13 08:57:53 -04:00
Merov Linden 522af96aca STORM-1001 : pull into viewer-development 2011-03-11 16:05:27 -08:00
Merov Linden 4790944923 STORM-1067 : pull into viewer-development 2011-03-11 16:04:17 -08:00
Merov Linden 8c20875323 STORM-1059 : pull into viewer-development 2011-03-11 16:02:40 -08:00
Merov Linden 22946d446e STORM-1073 : pull into viewer-development 2011-03-11 16:01:21 -08:00
Merov Linden d550a7e8bc STORM-1020 : pull into viewer-development 2011-03-11 15:57:57 -08:00
Merov Linden 16443c4df3 STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett) 2011-03-11 15:09:44 -08:00
Merov Linden 005da00fff STORM-1059 : Fix for cache purging (fix by Aleric) 2011-03-11 14:38:09 -08:00
Oz Linden 1426765e82 increment version to 2.5.3 2011-03-10 20:27:45 -05:00
Oz Linden c556efbce8 increment patch release 2011-03-10 20:21:40 -05:00
Oz Linden ca55bce3ab correct merge error in llviewerobjectlist.cpp 2011-03-10 19:14:42 -05:00
Oz Linden df633558e4 add parameters for pre-release repo 2011-03-10 16:42:07 -05:00
Ricky Curtice c790866e46 Corrected a call to the mac-specific command "Rez" that had the wrong case. This is only an issue on Macs that have a case-sensitive root filesystem. 2011-03-10 12:06:59 -08:00
Oz Linden 57c5d47401 pull 2.5.1 tag back from viewer-release 2011-03-10 13:40:36 -05:00
Merov Linden 0c02401498 Crash hunters: pull in viewer-development 2011-03-09 11:56:34 -08:00
Merov Linden 075b1af62a STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Merov Linden 76a325b832 STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Xiaohong Bao 7e7ea1eec4 fix for STORM-1053: crash at LLTextureCache::writeToCache 2011-03-08 14:59:40 -07:00
Xiaohong Bao 55694cb241 fix for STORM-1053: crash at LLTextureCache::writeToCache 2011-03-08 14:59:40 -07:00
Xiaohong Bao d4c0c81c72 fix for STORM-1052: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 2011-03-08 14:20:14 -07:00
Xiaohong Bao 9f765cdb13 fix for STORM-1052: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 2011-03-08 14:20:14 -07:00
Xiaohong Bao 913f927fc8 fix for STORM-1049: [crashhunters] crash at LLViewerFetchedTexture::forceToSaveRawImage(int,bool) 2011-03-08 11:52:28 -07:00
Xiaohong Bao b319e25598 fix for STORM-1049: [crashhunters] crash at LLViewerFetchedTexture::forceToSaveRawImage(int,bool) 2011-03-08 11:52:28 -07:00
Xiaohong Bao da82bccd17 Automated merge with http://hg.secondlife.com/viewer-development 2011-03-07 18:10:42 -07: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
Xiaohong Bao e841d62f81 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
Xiaohong Bao 1405bbd81e 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
Xiaohong Bao ec6092c321 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 SIMmONs a07e6c6251 Merge branches 2011-03-07 16:39:38 -08:00
Dave SIMmONs a6ff010dc1 ER-350: Viewer / sim camera positioning not working well on login. Viewer now sets the camera before calling send_agent_update(). Reviewed by Kelly. 2011-03-07 15:01:04 -08:00
Merov Linden be9bae601c STORM-1045 : pull into viewer-development 2011-03-07 14:31:09 -08:00
Merov Linden 1ec800fb44 STORM-1037 : pull into viewer-development 2011-03-07 14:28:58 -08:00
Merov Linden 6f53d62365 STORM-236 : pull into viewer-development 2011-03-07 14:24:57 -08:00
Merov Linden 7a33c9ef42 STORM-28 : pull into viewer-development 2011-03-07 14:13:51 -08:00
Xiaohong Bao a313cedd69 fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
reviewed by davep
2011-03-07 15:02:48 -07:00
Merov Linden cd3b76cb52 STORM-10140 : pull into viewer-development 2011-03-08 16:12:05 -08:00
Merov Linden 75cc20848e STORM-1015 : pull into viewer-development 2011-03-08 16:09:18 -08:00
Merov Linden 0bc84cea2e STORM-990 : pull into viewer-development 2011-03-08 16:07:52 -08:00
Merov Linden 7dc7754ed3 STORM-494 : pull into viewer-development 2011-03-08 16:06:29 -08:00
Xiaohong Bao 8610a6424e fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
reviewed by davep
2011-03-07 15:02:48 -07:00
Xiaohong Bao e64096da69 fix for STORM-1026: Viewer crahes while trying to reset Graphics quality.
reviewed by davep
2011-03-07 15:02:48 -07:00
Dessie Linden 0787aecd68 Added tag DRTVWR-37_2.5.1-release for changeset 4dede9ae1ec7 2011-03-09 14:54:58 -08:00
Oz Linden d3ca4983a4 Added tag 2.5.1-release for changeset 4dede9ae1ec7 2011-03-07 16:34:43 -05:00
Merov Linden 7f5c3795b7 Update version number to 2.5.2 2011-03-07 10:24:56 -08:00
Vadim ProductEngine 176b025a26 STORM-236 WIP Additional fixes.
Fixed:
* Wrong ability to place a button between the chat input and the drag handle (thanks Wolfpup!).
* Broken drag-n-drop cursors.
2011-03-04 19:10:54 +02:00
Jonathan Yap ecb693e825 STORM-1040 Added code for media beacons, which are coming in Storm-1019 2011-03-04 11:35:50 -05:00
Jonathan Yap 4d8244573c STORM-1040 Text that shows what Beacons you are viewing is always in English 2011-03-04 08:46:45 -05:00
Vadim ProductEngine 211465b772 STORM-236 WIP Minor code improvements.
- To decrease code duplication:
  * Added RS_BUTTON_SPEAK to the button->panel mapping (mStateProcessedObjectMap).
  * Replaces all lookups in mStateProcessedObjectMap with calls to getButtonPanel().
- Added some comments.
2011-03-04 13:46:57 +02:00