diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llimview.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp index 92e46b4..cad8649 100644 --- a/linden/indra/newview/llimview.cpp +++ b/linden/indra/newview/llimview.cpp | |||
@@ -420,6 +420,8 @@ void LLIMMgr::addMessage( | |||
420 | other_participant_id = LLUUID::null; | 420 | other_participant_id = LLUUID::null; |
421 | } | 421 | } |
422 | 422 | ||
423 | |||
424 | |||
423 | LLFloaterIMPanel* floater; | 425 | LLFloaterIMPanel* floater; |
424 | LLUUID new_session_id = session_id; | 426 | LLUUID new_session_id = session_id; |
425 | if (new_session_id.isNull()) | 427 | if (new_session_id.isNull()) |
@@ -871,19 +873,14 @@ public: | |||
871 | 873 | ||
872 | if ( floaterp ) | 874 | if ( floaterp ) |
873 | { | 875 | { |
874 | std::string error_string; | ||
875 | |||
876 | if ( 404 == statusNum ) | 876 | if ( 404 == statusNum ) |
877 | { | 877 | { |
878 | std::string error_string; | ||
878 | error_string = "does not exist"; | 879 | error_string = "does not exist"; |
879 | } | ||
880 | else | ||
881 | { | ||
882 | error_string = "generic"; | ||
883 | } | ||
884 | 880 | ||
885 | floaterp->showSessionStartError( | 881 | floaterp->showSessionStartError( |
886 | error_string); | 882 | error_string); |
883 | } | ||
887 | } | 884 | } |
888 | } | 885 | } |
889 | } | 886 | } |