aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorAleric Inglewood2010-09-30 02:17:43 +0200
committerMcCabe Maxsted2010-10-01 23:56:59 -0700
commitb5b6e556ed7e9fa6bdea2365e82765981ee9f28c (patch)
treef984604269dc1d49b271cbfefbe9dd2ce6bf13c7 /linden/indra/newview
parentUpdate of doc/contributions.txt (diff)
downloadmeta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.zip
meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.gz
meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.bz2
meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.xz
SNOW-86: Dangerous macro leads to possible wrong code
See http://redmine.imprudenceviewer.org/issues/571 This patch appeared to already have been partially applied. I added more semi-colons after all llendl (and LLENDL) macros, and wrapped the lllog ... llendl construct into do { ... } while(0) as is usual for macros that mimic a single statement. The patch was double checked with regular expression greps and a compile.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llmaniprotate.cpp4
-rw-r--r--linden/indra/newview/llpreviewscript.cpp2
-rw-r--r--linden/indra/newview/llstatview.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index ad7399e..df503ec 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -1233,9 +1233,9 @@ LLVector3 LLManipRotate::getConstraintAxis()
1233 else 1233 else
1234 { 1234 {
1235#ifndef LL_RELEASE_FOR_DOWNLOAD 1235#ifndef LL_RELEASE_FOR_DOWNLOAD
1236 llerrs << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl 1236 llerrs << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl;
1237#else 1237#else
1238 llwarns << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl 1238 llwarns << "Got bogus hit part in LLManipRotate::getConstraintAxis():" << mManipPart << llendl;
1239#endif 1239#endif
1240 axis.mV[0] = 1.f; 1240 axis.mV[0] = 1.f;
1241 } 1241 }
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index d8c3aa9..bde7242 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1396,7 +1396,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
1396 else 1396 else
1397 { 1397 {
1398 llwarns << "Inventory item for script " << info->mItemUUID 1398 llwarns << "Inventory item for script " << info->mItemUUID
1399 << " is no longer in agent inventory." << llendl 1399 << " is no longer in agent inventory." << llendl;
1400 } 1400 }
1401 1401
1402 // Find our window and close it if requested. 1402 // Find our window and close it if requested.
diff --git a/linden/indra/newview/llstatview.cpp b/linden/indra/newview/llstatview.cpp
index a38c012..9a3fcff 100644
--- a/linden/indra/newview/llstatview.cpp
+++ b/linden/indra/newview/llstatview.cpp
@@ -76,7 +76,7 @@ LLStatBar *LLStatView::addStat(const std::string& name, LLStat *statp,
76 76
77// if (getStatBar(name)) 77// if (getStatBar(name))
78// { 78// {
79// llinfos << "LLStatView::addStat - Stat already exists!" << llendl 79// llinfos << "LLStatView::addStat - Stat already exists!" << llendl;
80// return NULL; 80// return NULL;
81// } 81// }
82 82