summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-10 15:32:42 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-12-10 15:32:42 -0500
commit798377b076fbce895ba2075417107de0da10b9ca (patch)
tree30238590638bfebf17b8f821b487ee6b05cc8fc5
parent6a5e227dc11f19dd7901226a454cebcd16ca7f2d (diff)
SH-3606 WIP - fixed bug found by persnickety compiler
-rwxr-xr-xindra/newview/app_settings/logcontrol.xml2
-rwxr-xr-xindra/newview/llviewerinventory.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 64122bbb6c..1259039010 100755
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,8 +42,8 @@
</array>
<key>tags</key>
<array>
- <!-- sample entry for debugging specific items
<string>Avatar</string>
+ <!-- sample entry for debugging specific items
<string>Voice</string>
-->
</array>
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 1a427605b6..13e95c57cb 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -289,7 +289,7 @@ public:
// virtual
~LLBoostFuncInventoryCallback()
{
- mDestroyFunc;
+ mDestroyFunc();
}