diff options
| author | McCabe Maxsted | 2009-06-05 18:30:09 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-05 18:30:09 -0700 |
| commit | ab324d7f6a9672d1f27481d9c38f9e7dae95be5e (patch) | |
| tree | cfd49a8b5cbc4b5628a9f3bc25cc2ee51916d09b /linden/indra/newview/llfloaterworldmap.cpp | |
| parent | Menu bar now only changes color for Aditi (diff) | |
| parent | Merge branch 'mccabe/next' into next-1.1 (diff) | |
| download | meta-impy-ab324d7f6a9672d1f27481d9c38f9e7dae95be5e.zip meta-impy-ab324d7f6a9672d1f27481d9c38f9e7dae95be5e.tar.gz meta-impy-ab324d7f6a9672d1f27481d9c38f9e7dae95be5e.tar.bz2 meta-impy-ab324d7f6a9672d1f27481d9c38f9e7dae95be5e.tar.xz | |
Merged in jacek/next
Diffstat (limited to 'linden/indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterworldmap.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp index 8396454..66b2813 100644 --- a/linden/indra/newview/llfloaterworldmap.cpp +++ b/linden/indra/newview/llfloaterworldmap.cpp | |||
| @@ -1052,8 +1052,7 @@ void LLFloaterWorldMap::onPanBtn( void* userdata ) | |||
| 1052 | // static | 1052 | // static |
| 1053 | void LLFloaterWorldMap::onGoHome(void*) | 1053 | void LLFloaterWorldMap::onGoHome(void*) |
| 1054 | { | 1054 | { |
| 1055 | gAgent.teleportHome(); | 1055 | gAgent.teleportHomeConfirm(); |
| 1056 | gFloaterWorldMap->close(); | ||
| 1057 | } | 1056 | } |
| 1058 | 1057 | ||
| 1059 | 1058 | ||