diff options
author | Jacek Antonelli | 2008-12-10 21:56:24 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-10 21:57:11 -0600 |
commit | 0febd03d39e36d2955c1869abeb2074fabc5c0fc (patch) | |
tree | 331ab831543ae691b0b5fc7d15c9051dd55f3204 | |
parent | Fixed blank url_history.xml creation. (VWR-5808) (diff) | |
download | meta-impy-0febd03d39e36d2955c1869abeb2074fabc5c0fc.zip meta-impy-0febd03d39e36d2955c1869abeb2074fabc5c0fc.tar.gz meta-impy-0febd03d39e36d2955c1869abeb2074fabc5c0fc.tar.bz2 meta-impy-0febd03d39e36d2955c1869abeb2074fabc5c0fc.tar.xz |
Fixed bad string comparison (grid code name). [#22]
Reported by Balp Allen.
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/llviewernetwork.cpp | 3 |
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 @@ | |||
1 | 2008-12-10 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/newview/llviewernetwork.cpp: | ||
4 | Fixed bad string comparison (grid code name). [#22] | ||
5 | Reported by Balp Allen. | ||
6 | |||
7 | |||
1 | 2008-12-06 Jacek Antonelli <jacek.antonelli@gmail.com> | 8 | 2008-12-06 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 9 | ||
3 | * ChangeLog: | 10 | * 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 | |||
163 | 163 | ||
164 | std::string LLViewerLogin::getGridCodeName() const | 164 | std::string LLViewerLogin::getGridCodeName() const |
165 | { | 165 | { |
166 | if( gGridInfo[mGridChoice].mCodeName == "" ) | 166 | // Fall back to grid label if code name is empty. |
167 | if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 ) | ||
167 | { | 168 | { |
168 | return getGridLabel(); | 169 | return getGridLabel(); |
169 | } | 170 | } |