diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-09 10:12:44 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-09 10:12:44 +0100 |
| commit | e24bfa78666788bc1e5179ff5d4ac3bf7d0a5491 (patch) | |
| tree | 8321dff00268a5f8783586a9e59a6dee7b50e2aa /indra/newview/llviewermessage.cpp | |
| parent | 275581a3855f7c9c593ad314dfa386ceb952169c (diff) | |
| parent | ae43801f44d6c1c23bb6aea17452c7ddcdec65a3 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5836aff4e7..b00fa39815 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2063,7 +2063,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // initiated by the other party) then... std::string my_name; LLAgentUI::buildFullname(my_name); - std::string response = gSavedPerAccountSettings.getString("BusyModeResponse2"); + std::string response = gSavedPerAccountSettings.getString("BusyModeResponse"); pack_instant_message( gMessageSystem, gAgent.getID(), @@ -2736,7 +2736,7 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id) { std::string my_name; LLAgentUI::buildFullname(my_name); - std::string response = gSavedPerAccountSettings.getString("BusyModeResponse2"); + std::string response = gSavedPerAccountSettings.getString("BusyModeResponse"); pack_instant_message( gMessageSystem, gAgent.getID(), |