aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2012-02-18 01:10:11 -0700
committerMcCabe Maxsted2012-02-18 01:10:11 -0700
commitfc185a8e8da41d1f2b196cc9d5c6765e00f929c0 (patch)
tree3ced27189f7a82a9fa050b78835916840180c331 /linden
parentRemoved google translate since the service is no longer available (diff)
downloadmeta-impy-fc185a8e8da41d1f2b196cc9d5c6765e00f929c0.zip
meta-impy-fc185a8e8da41d1f2b196cc9d5c6765e00f929c0.tar.gz
meta-impy-fc185a8e8da41d1f2b196cc9d5c6765e00f929c0.tar.bz2
meta-impy-fc185a8e8da41d1f2b196cc9d5c6765e00f929c0.tar.xz
Fixed compile error introduced in b2bc5393
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llfloateropenobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index 3e672b5..5f62e87 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -195,7 +195,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
195void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLSD& result, void* data) 195void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLSD& result, void* data)
196{ 196{
197 LLCategoryCreate* cat_data = (LLCategoryCreate*)data; 197 LLCategoryCreate* cat_data = (LLCategoryCreate*)data;
198 if (result.has("failure") and result["failure"]) 198 if (result.has("failure") && result["failure"])
199 { 199 {
200 delete cat_data; 200 delete cat_data;
201 return; 201 return;