From 265d363a0f390f5dda2bf8e8fc242c4f9c91cfe3 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Mon, 9 May 2011 18:07:01 -0400 Subject: Added tag DRTVWR-52_2.6.6-beta1, 2.6.6-beta1 for changeset bb1075286b3b --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index c1d3e88e37..3b0ce079fd 100644 --- a/.hgtags +++ b/.hgtags @@ -106,3 +106,5 @@ d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc 2.6.3-beta1 7db558aaa7c176f2022b3e9cfe38ac72f6d1fccd DRTVWR-50_2.6.5-beta1 7db558aaa7c176f2022b3e9cfe38ac72f6d1fccd 2.6.5-beta1 800cefce8d364ffdd2f383cbecb91294da3ea424 2.6.6-start +bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 DRTVWR-52_2.6.6-beta1 +bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1 -- cgit v1.2.3 From 1f26ff1b428b47f04f50e54a7806c36d1fa39b07 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Mon, 9 May 2011 18:19:16 -0400 Subject: Added tag 2.6.8-start for changeset 5e349dbe9cc8 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d81dc4b775..f09bb834c5 100644 --- a/.hgtags +++ b/.hgtags @@ -107,3 +107,4 @@ d7fcefabdf32bb61a9ea6d6037c1bb26190a85bc 2.6.3-beta1 7db558aaa7c176f2022b3e9cfe38ac72f6d1fccd 2.6.5-beta1 800cefce8d364ffdd2f383cbecb91294da3ea424 2.6.6-start ce588bc1ae8e3a90ee5e1f5de71a346886a9fd8b 2.6.7-start +5e349dbe9cc84ea5795af8aeb6d473a0af9d4953 2.6.8-start -- cgit v1.2.3 From 604f92fa200a72e291a53f58957792d4b281168e Mon Sep 17 00:00:00 2001 From: callum Date: Mon, 9 May 2011 17:10:26 -0700 Subject: EXP-801 FIX Linden Research Inc text is clipped on login page in Basic mode (Reverted change back to original behavior - needs attention later) --- indra/newview/skins/minimal/xui/en/main_view.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml index ac5bae2f3b..6e8ad9adaf 100644 --- a/indra/newview/skins/minimal/xui/en/main_view.xml +++ b/indra/newview/skins/minimal/xui/en/main_view.xml @@ -8,6 +8,13 @@ tab_stop="false" name="main_view" width="1024"> + + - - Date: Mon, 9 May 2011 17:24:56 -0700 Subject: EXP-776 WIP [crashhunters] crash in LLCloudLayer::decompress EXP-777 WIP [crashhunters] crash in LLWind::decompress added NULL check --- indra/newview/llviewermessage.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ef5968a5e2..0b8e5cf303 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -344,6 +344,11 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data) { LLViewerRegion *regionp = LLWorld::getInstance()->getRegion(mesgsys->getSender()); + if(!regionp) + { + llwarns << "Invalid region for layer data." << llendl; + return; + } S32 size; S8 type; -- cgit v1.2.3