2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e1d0ae3..d18fa5c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2008-12-10  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llviewernetwork.cpp:
+        Fixed bad string comparison (grid code name). [#22]
+        Reported by Balp Allen.
+
+
 2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * ChangeLog:
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index c8cffcf..2b5cc0c 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -163,7 +163,8 @@ std::string LLViewerLogin::getGridLabel() const
 
 std::string LLViewerLogin::getGridCodeName() const
 {
-        if( gGridInfo[mGridChoice].mCodeName == "" )
+        // Fall back to grid label if code name is empty.
+        if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 )
         {
                 return getGridLabel();
         }