diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-11 10:08:37 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-11 10:08:37 -0800 |
commit | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (patch) | |
tree | ed7bdc596ee0a856f9739864239f75c64db85f50 /indra/newview/llgroupactions.cpp | |
parent | 4b710367a1ac986e8be731bc391c0b375424148f (diff) | |
parent | 0a8d9fa5b5d044bed7d4c38ec51d87bc90f3b3a6 (diff) |
merge
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r-- | indra/newview/llgroupactions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 6fe8ed0e4d..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; @@ -113,7 +113,7 @@ LLGroupHandler gGroupHandler; // static void LLGroupActions::search() { - LLFloaterReg::showInstance("search", LLSD().insert("category", "groups")); + LLFloaterReg::showInstance("search", LLSD().with("category", "groups")); } // static |