diff options
| author | McCabe Maxsted | 2010-07-15 02:02:57 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-07-15 02:11:25 -0700 |
| commit | 145c9172381f8bef303a86689b52dadf6a05975a (patch) | |
| tree | 392b2cd85309d65c6eea98efd3a65bf96238554a /linden/indra/newview/llweb.cpp | |
| parent | Fixed #368: showlookatinfo notification missing, friendship and calling card ... (diff) | |
| download | meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.zip meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.tar.gz meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.tar.bz2 meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.tar.xz | |
Fixed Bug #262: 'Help > Viewer Help' name does not match behavior (also fixed LLWeb::loadURL)
Diffstat (limited to 'linden/indra/newview/llweb.cpp')
| -rw-r--r-- | linden/indra/newview/llweb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llweb.cpp b/linden/indra/newview/llweb.cpp index 6425156..fb4b063 100644 --- a/linden/indra/newview/llweb.cpp +++ b/linden/indra/newview/llweb.cpp | |||
| @@ -55,7 +55,7 @@ void LLWeb::loadURL(const std::string& url) | |||
| 55 | } | 55 | } |
| 56 | else | 56 | else |
| 57 | { | 57 | { |
| 58 | LLFloaterMediaBrowser::showInstance(url); | 58 | LLFloaterMediaBrowser::getInstance()->openMedia(url); |
| 59 | } | 59 | } |
| 60 | } | 60 | } |
| 61 | 61 | ||
| @@ -71,7 +71,7 @@ void LLWeb::loadURLExternal(const std::string& url) | |||
| 71 | // static | 71 | // static |
| 72 | void LLWeb::loadURLInternal(const std::string& url) | 72 | void LLWeb::loadURLInternal(const std::string& url) |
| 73 | { | 73 | { |
| 74 | LLFloaterMediaBrowser::showInstance(url); | 74 | LLFloaterMediaBrowser::getInstance()->openMedia(url); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | 77 | ||