summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterperms.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-12 08:47:26 -0400
committerOz Linden <oz@lindenlab.com>2010-10-12 08:47:26 -0400
commit3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch)
treec3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/llfloaterperms.cpp
parent422780c88a98ad0b78c54a71189219de12992bc2 (diff)
parent011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff)
merge fixes for VWR-23296
Diffstat (limited to 'indra/newview/llfloaterperms.cpp')
-rw-r--r--indra/newview/llfloaterperms.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 74dfede23e..80b55c3cbb 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -37,7 +37,6 @@
LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
: LLFloater(seed)
{
- //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_perm_prefs.xml");
mCommitCallbackRegistrar.add("Perms.Copy", boost::bind(&LLFloaterPerms::onCommitCopy, this));
mCommitCallbackRegistrar.add("Perms.OK", boost::bind(&LLFloaterPerms::onClickOK, this));
mCommitCallbackRegistrar.add("Perms.Cancel", boost::bind(&LLFloaterPerms::onClickCancel, this));