aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterobjectiminfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterobjectiminfo.cpp')
-rw-r--r--linden/indra/newview/llfloaterobjectiminfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterobjectiminfo.cpp b/linden/indra/newview/llfloaterobjectiminfo.cpp
index 06e6213..19721cc 100644
--- a/linden/indra/newview/llfloaterobjectiminfo.cpp
+++ b/linden/indra/newview/llfloaterobjectiminfo.cpp
@@ -137,7 +137,7 @@ void LLFloaterObjectIMInfo::onClickMap(void* data)
137 137
138 std::ostringstream link; 138 std::ostringstream link;
139 link << "secondlife://" << self->mSlurl; 139 link << "secondlife://" << self->mSlurl;
140 class LLWebBrowserCtrl* web = NULL; 140 class LLMediaCtrl* web = NULL;
141 LLURLDispatcher::dispatch(link.str(), web, true); 141 LLURLDispatcher::dispatch(link.str(), web, true);
142} 142}
143 143
@@ -213,14 +213,14 @@ public:
213 LLObjectIMInfoHandler() : LLCommandHandler("objectim", true) { } 213 LLObjectIMInfoHandler() : LLCommandHandler("objectim", true) { }
214 214
215 bool handle(const LLSD& tokens, const LLSD& query_map, 215 bool handle(const LLSD& tokens, const LLSD& query_map,
216 LLWebBrowserCtrl* web); 216 LLMediaCtrl* web);
217}; 217};
218 218
219// Creating the object registers with the dispatcher. 219// Creating the object registers with the dispatcher.
220LLObjectIMInfoHandler gObjectIMHandler; 220LLObjectIMInfoHandler gObjectIMHandler;
221 221
222// ex. secondlife:///app/objectim/9426adfc-9c17-8765-5f09-fdf19957d003?owner=a112d245-9095-4e9c-ace4-ffa31717f934&groupowned=true&slurl=ahern/123/123/123&name=Object 222// ex. secondlife:///app/objectim/9426adfc-9c17-8765-5f09-fdf19957d003?owner=a112d245-9095-4e9c-ace4-ffa31717f934&groupowned=true&slurl=ahern/123/123/123&name=Object
223bool LLObjectIMInfoHandler::handle(const LLSD &tokens, const LLSD &query_map, LLWebBrowserCtrl* web) 223bool LLObjectIMInfoHandler::handle(const LLSD &tokens, const LLSD &query_map, LLMediaCtrl* web)
224{ 224{
225 LLUUID task_id = tokens[0].asUUID(); 225 LLUUID task_id = tokens[0].asUUID();
226 std::string name = query_map["name"].asString(); 226 std::string name = query_map["name"].asString();