diff options
Diffstat (limited to 'linden/indra/newview/llpanelnetwork.cpp')
-rw-r--r-- | linden/indra/newview/llpanelnetwork.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp index 6ba8906..2edd1a1 100644 --- a/linden/indra/newview/llpanelnetwork.cpp +++ b/linden/indra/newview/llpanelnetwork.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -89,7 +90,7 @@ void LLPanelNetwork::onClickClearCache(void*) | |||
89 | { | 90 | { |
90 | // flag client cache for clearing next time the client runs | 91 | // flag client cache for clearing next time the client runs |
91 | gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); | 92 | gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); |
92 | gViewerWindow->alertXml("CacheWillClear"); | 93 | LLNotifications::instance().add("CacheWillClear"); |
93 | } | 94 | } |
94 | 95 | ||
95 | // static | 96 | // static |
@@ -110,7 +111,7 @@ void LLPanelNetwork::onClickSetCache(void* user_data) | |||
110 | if (!dir_name.empty() && dir_name != cur_name) | 111 | if (!dir_name.empty() && dir_name != cur_name) |
111 | { | 112 | { |
112 | self->childSetText("cache_location", dir_name); | 113 | self->childSetText("cache_location", dir_name); |
113 | gViewerWindow->alertXml("CacheWillBeMoved"); | 114 | LLNotifications::instance().add("CacheWillBeMoved"); |
114 | gSavedSettings.setString("NewCacheLocation", dir_name); | 115 | gSavedSettings.setString("NewCacheLocation", dir_name); |
115 | } | 116 | } |
116 | else | 117 | else |
@@ -127,7 +128,7 @@ void LLPanelNetwork::onClickResetCache(void* user_data) | |||
127 | if (!gSavedSettings.getString("CacheLocation").empty()) | 128 | if (!gSavedSettings.getString("CacheLocation").empty()) |
128 | { | 129 | { |
129 | gSavedSettings.setString("NewCacheLocation", ""); | 130 | gSavedSettings.setString("NewCacheLocation", ""); |
130 | gViewerWindow->alertXml("CacheWillBeMoved"); | 131 | LLNotifications::instance().add("CacheWillBeMoved"); |
131 | } | 132 | } |
132 | std::string cache_location = gDirUtilp->getCacheDir(true); | 133 | std::string cache_location = gDirUtilp->getCacheDir(true); |
133 | self->childSetText("cache_location", cache_location); | 134 | self->childSetText("cache_location", cache_location); |
@@ -141,5 +142,5 @@ void LLPanelNetwork::onCommitPort(LLUICtrl* ctrl, void* data) | |||
141 | 142 | ||
142 | if (!self || !check) return; | 143 | if (!self || !check) return; |
143 | self->childSetEnabled("connection_port", check->get()); | 144 | self->childSetEnabled("connection_port", check->get()); |
144 | gViewerWindow->alertXml("ChangeConnectionPort"); | 145 | LLNotifications::instance().add("ChangeConnectionPort"); |
145 | } | 146 | } |