diff options
| author | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:09:28 -0700 |
| commit | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (patch) | |
| tree | 43935b338c5a87ca32f9240389470a96271fa1f5 /indra/newview/llviewerfloaterreg.cpp | |
| parent | 8b09dfb8907c364f09ee82d00926219ae52b5ee9 (diff) | |
| parent | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (diff) | |
Automated merge with file:///e:\code\viewer-experience
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 77afd0ea22..dd0989d608 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -130,12 +130,12 @@ // *NOTE: Please add files in alphabetical order to keep merges easy. -// handle secondlife:///app/floater/{NAME} URLs +// handle secondlife:///app/openfloater/{NAME} URLs class LLFloaterOpenHandler : public LLCommandHandler { public: // requires trusted browser to trigger - LLFloaterOpenHandler() : LLCommandHandler("floater", UNTRUSTED_THROTTLE) { } + LLFloaterOpenHandler() : LLCommandHandler("openfloater", UNTRUSTED_THROTTLE) { } bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web) |