From 294c5f3d3a29f1d52b587b9b1750b65238ca2dee Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 23 May 2011 12:15:04 -0400 Subject: SH-1616 FIX SL client crashes on startup for debug builds Added more NULL checks for llconvexdecompositionstub, to avoid crashing. Clients won't be able to upload meshes using the stub, but should be able to run the client otherwise. --- indra/newview/llmeshrepository.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 0a1eadf4d0..f06c5dcd64 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3374,6 +3374,12 @@ void LLPhysicsDecomp::doDecomposition() LLCDMeshData mesh; S32 stage = mStageID[mCurRequest->mStage]; + if (LLConvexDecomposition::getInstance() == NULL) + { + // stub library. do nothing. + return; + } + //load data intoLLCD if (stage == 0) { @@ -3574,6 +3580,12 @@ void LLPhysicsDecomp::doDecompositionSingleHull() LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); + if (decomp == NULL) + { + //stub. do nothing. + return; + } + for (S32 i = 0; i < param_count; ++i) { decomp->setParam(params[i].mName, params[i].mDefault.mIntOrEnumValue); @@ -3653,6 +3665,11 @@ void LLPhysicsDecomp::doDecompositionSingleHull() void LLPhysicsDecomp::run() { LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); + if (decomp == NULL) + { + return; + } + decomp->initThread(); mInited = true; -- cgit v1.2.3 From 0ef13640636bf8dbc252b9b4ee3849ccc0d2148c Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 23 May 2011 16:56:06 -0400 Subject: STORM-1275 FIX viewer gets caught in infinite loop for decompstub Fixed setting the initialized flag for the decomposition stub case (for OS builds) so that the viewer doesn't hang when initializing the stub. Note that initialized will be set to true even when instance will return NULL. --- indra/newview/llmeshrepository.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index f06c5dcd64..0b96a3b34f 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3667,6 +3667,9 @@ void LLPhysicsDecomp::run() LLConvexDecomposition* decomp = LLConvexDecomposition::getInstance(); if (decomp == NULL) { + // stub library. Set init to true so the main thread + // doesn't wait for this to finish. + mInited = true; return; } -- cgit v1.2.3 From 03ba07008c045593de0c44a345e34c69f31b5461 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Tue, 24 May 2011 17:19:42 -0400 Subject: Added tag DRTVWR-54_2.6.8-release, 2.6.8-release for changeset be2000b946f8 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 30fe81d3cd..396d0a8210 100644 --- a/.hgtags +++ b/.hgtags @@ -111,3 +111,5 @@ bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1 5e349dbe9cc84ea5795af8aeb6d473a0af9d4953 2.6.8-start beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1 beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1 +be2000b946f8cb3de5f44b2d419287d4c48ec4eb DRTVWR-54_2.6.8-release +be2000b946f8cb3de5f44b2d419287d4c48ec4eb 2.6.8-release -- cgit v1.2.3 From 1b38f610618d3c08ce7dd21b6d3222de3017547e Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Tue, 24 May 2011 17:34:56 -0400 Subject: Added tag DRTVWR-51_2.6.6-release, 2.6.6-release for changeset dac76a711da5 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 396d0a8210..a16db8e591 100644 --- a/.hgtags +++ b/.hgtags @@ -113,3 +113,5 @@ beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1 beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1 be2000b946f8cb3de5f44b2d419287d4c48ec4eb DRTVWR-54_2.6.8-release be2000b946f8cb3de5f44b2d419287d4c48ec4eb 2.6.8-release +dac76a711da5f1489a01c1fa62ec97d99c25736d DRTVWR-51_2.6.6-release +dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release -- cgit v1.2.3 From 6c5ecf260eba03dfad8fae4573b517d2d7c797f2 Mon Sep 17 00:00:00 2001 From: "Debi King (Dessie)" Date: Tue, 24 May 2011 17:35:49 -0400 Subject: Added tag DRTVWR-46_2.6.3-release, 2.6.3-release for changeset 8f2da1701c81 --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index a16db8e591..5d19b8b679 100644 --- a/.hgtags +++ b/.hgtags @@ -115,3 +115,5 @@ be2000b946f8cb3de5f44b2d419287d4c48ec4eb DRTVWR-54_2.6.8-release be2000b946f8cb3de5f44b2d419287d4c48ec4eb 2.6.8-release dac76a711da5f1489a01c1fa62ec97d99c25736d DRTVWR-51_2.6.6-release dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release +8f2da1701c81a62352df2b8d413d27fb2cade9a6 DRTVWR-46_2.6.3-release +8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release -- cgit v1.2.3 From a0af5e972a4c293cb8b2aff5d6d98baa7015f864 Mon Sep 17 00:00:00 2001 From: eli_linden Date: Wed, 25 May 2011 11:53:02 -0700 Subject: FIX VWR-25039 en_xui_change --- indra/newview/skins/default/xui/de/panel_group_notices.xml | 2 +- indra/newview/skins/default/xui/en/panel_group_notices.xml | 10 +++++----- indra/newview/skins/default/xui/it/panel_group_notices.xml | 9 +++------ indra/newview/skins/default/xui/nl/panel_group_notices.xml | 9 +++------ indra/newview/skins/default/xui/pl/panel_group_notices.xml | 2 +- indra/newview/skins/default/xui/pt/panel_group_notices.xml | 9 +++------ 6 files changed, 16 insertions(+), 25 deletions(-) diff --git a/indra/newview/skins/default/xui/de/panel_group_notices.xml b/indra/newview/skins/default/xui/de/panel_group_notices.xml index 8c1df04ed8..df423cc69a 100644 --- a/indra/newview/skins/default/xui/de/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml @@ -49,7 +49,7 @@ Maximal 200 pro Gruppe täglich Archivierte Mitteilung - Um eine neue Mitteilung zu senden, klicken Sie die Schaltfläche + + Um eine neue Mitteilung zu senden, klicken Sie die + Neue Mitteilung Betreff: diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 600b0e3b71..607e1bb213 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -84,7 +84,7 @@ Maximum 200 per group daily name="create_new_notice" tool_tip="Create a new notice" top_delta="0" - width="93" /> + width="127" />