diff options
| author | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
| commit | 7851819c88e8049c1c3d07d279d479c53d5de777 (patch) | |
| tree | e8c81e110a71427b64e0b34f4351e7acf44465f3 /indra/newview/llgroupactions.cpp | |
| parent | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (diff) | |
| parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) | |
local merge
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 4adefdfcaf..fdb2b886a6 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -100,9 +100,9 @@ public: } if (tokens[1].asString() == "inspect") { - LLSD key; - key["group_id"] = group_id; - LLFloaterReg::showInstance("inspect_group", key); + if (group_id.isNull()) + return true; + LLGroupActions::show(group_id); return true; } return false; |