aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/newview/llimview.cpp
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/newview/llimview.cpp')
-rw-r--r--linden/indra/newview/llimview.cpp15
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 }