aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterpermissionsmgr.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaterpermissionsmgr.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterpermissionsmgr.h')
-rw-r--r--linden/indra/newview/llfloaterpermissionsmgr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.h b/linden/indra/newview/llfloaterpermissionsmgr.h
index 01e1ecc..cc89f97 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.h
+++ b/linden/indra/newview/llfloaterpermissionsmgr.h
@@ -80,7 +80,7 @@ public:
80 80
81public: 81public:
82 void clearPermissionsData(); 82 void clearPermissionsData();
83 void addPermissionsData(const LLString& object_name, const LLUUID& object_id, U32 permissions_flags); 83 void addPermissionsData(const std::string& object_name, const LLUUID& object_id, U32 permissions_flags);
84 84
85 static void revokePermissions(void *userdata); 85 static void revokePermissions(void *userdata);
86 static void findObject(void *userdata); 86 static void findObject(void *userdata);