diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-06-13 18:02:37 +0000 |
| commit | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (patch) | |
| tree | db55a74f8d18b3c366608a537e2a32f6d089d56f /indra/newview/llviewermenu.cpp | |
| parent | 680667d4bdca7e2a6df15cd6f16f34c12c97da8e (diff) | |
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 1565a5875b..9aaac2af66 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3010,24 +3010,6 @@ class LLHelpMOTD : public view_listener_t } }; -class LLHelpLiveHelp : public view_listener_t -{ - bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) - { - // the session_id of a 911 session will always be this agent's session id - static LLUUID session_id(LLUUID::null); - if (session_id.isNull()) - { - session_id.generate(); - } - gIMView->setFloaterOpen(TRUE); - LLDynamicArray<LLUUID> members; - members.put(gAgent.getID()); - gIMView->addSession("Help Request", IM_SESSION_911_START, session_id, members); //xui: translate - return true; - } -}; - // // Major mode switching // @@ -7642,7 +7624,6 @@ void initialize_menus() addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/ // Help menu - addMenu(new LLHelpLiveHelp(), "Help.LiveHelp"); addMenu(new LLHelpMOTD(), "Help.MOTD"); // Self pie menu |