diff options
author | Michelle2 Zenovka | 2008-09-20 13:16:14 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-20 13:16:14 -0500 |
commit | 3282c5ff73176cb9fe8a8be6a372790516237448 (patch) | |
tree | 07d019937b7d6ad84c4213f609de1f48da1e207f /linden/indra/newview/llviewermenu.cpp | |
parent | New optional SConstruct flag to specify an exact path to build (diff) | |
download | meta-impy-3282c5ff73176cb9fe8a8be6a372790516237448.zip meta-impy-3282c5ff73176cb9fe8a8be6a372790516237448.tar.gz meta-impy-3282c5ff73176cb9fe8a8be6a372790516237448.tar.bz2 meta-impy-3282c5ff73176cb9fe8a8be6a372790516237448.tar.xz |
VWR-5082: 'Set permissions on selected task inventory' feature.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 3e99384..1ec71ac 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -86,6 +86,7 @@ | |||
86 | #include "llfloateravatarinfo.h" | 86 | #include "llfloateravatarinfo.h" |
87 | #include "llfloateravatartextures.h" | 87 | #include "llfloateravatartextures.h" |
88 | #include "llfloaterbuildoptions.h" | 88 | #include "llfloaterbuildoptions.h" |
89 | #include "llfloaterbulkpermission.h" | ||
89 | #include "llfloaterbump.h" | 90 | #include "llfloaterbump.h" |
90 | #include "llfloaterbuy.h" | 91 | #include "llfloaterbuy.h" |
91 | #include "llfloaterbuycontents.h" | 92 | #include "llfloaterbuycontents.h" |
@@ -6239,6 +6240,17 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons | |||
6239 | } | 6240 | } |
6240 | } | 6241 | } |
6241 | 6242 | ||
6243 | class LLToolsSetBulkPerms : public view_listener_t | ||
6244 | { | ||
6245 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | ||
6246 | { | ||
6247 | LLFloaterBulkPermission* queue = NULL; | ||
6248 | queue = LLFloaterBulkPermission::create(); | ||
6249 | return true; | ||
6250 | } | ||
6251 | }; | ||
6252 | |||
6253 | |||
6242 | class LLToolsSelectedScriptAction : public view_listener_t | 6254 | class LLToolsSelectedScriptAction : public view_listener_t |
6243 | { | 6255 | { |
6244 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 6256 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
@@ -7827,6 +7839,7 @@ void initialize_menus() | |||
7827 | addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory"); | 7839 | addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory"); |
7828 | addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory"); | 7840 | addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory"); |
7829 | addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction"); | 7841 | addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction"); |
7842 | addMenu(new LLToolsSetBulkPerms(), "Tools.SetBulkPerms"); | ||
7830 | 7843 | ||
7831 | addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie"); | 7844 | addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie"); |
7832 | addMenu(new LLToolsEnableLink(), "Tools.EnableLink"); | 7845 | addMenu(new LLToolsEnableLink(), "Tools.EnableLink"); |