diff options
author | Palmer <palmer@lindenlab.com> | 2010-01-29 15:05:28 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2010-01-29 15:05:28 -0800 |
commit | bdb8ed5a0f70f8a7bf868448ef45e32e5beb8bdb (patch) | |
tree | f56bc9b202f49f1ab631524684b7db41ae571f80 /indra/newview/llgroupactions.cpp | |
parent | c504c40a754a79baf0e4b1d1c10ca44197d577df (diff) | |
parent | 0bb7a85d06e7201887962000cb3e91bf456ffa09 (diff) |
merge
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r-- | indra/newview/llgroupactions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index d6e2bb0445..3653371d76 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -75,11 +75,12 @@ public: return false; } + //*TODO by what to replace showing groups floater? if (tokens[0].asString() == "list") { if (tokens[1].asString() == "show") { - LLFloaterReg::showInstance("contacts", "groups"); + //LLFloaterReg::showInstance("contacts", "groups"); return true; } return false; |