diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-18 09:22:34 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-18 09:22:34 -0400 |
| commit | a3a4235a8904cf4d6e565c82d5d90d8a64c15180 (patch) | |
| tree | 1581a935ebca904758797c8f11f19b5093a9ab70 /indra | |
| parent | 76dc796a1a70290b00c47d0c43d8c8ba237dd7ac (diff) | |
EXT-6321 -- clicking on an event in the main map now invokes the event details floater instead of trying to do a search for the event.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 5edf72d4ae..27757d19e5 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -45,6 +45,7 @@ #include "llagent.h" #include "llcallingcard.h" +#include "llcommandhandler.h" #include "llviewercontrol.h" #include "llfloatermap.h" #include "llfloaterworldmap.h" @@ -1726,7 +1727,10 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask ) id.toString(uuid_str); uuid_str = uuid_str.substr(28); sscanf(uuid_str.c_str(), "%X", &event_id); - LLFloaterReg::showInstance("search", LLSD().with("category", "events").with("id", event_id)); + // Invoke the event details floater if someone is clicking on an event. + LLSD params(LLSD::emptyArray()); + params.append(event_id); + LLCommandDispatcher::dispatch("event", params, LLSD(), NULL, true); break; } case MAP_ITEM_LAND_FOR_SALE: |