diff options
author | Jacek Antonelli | 2008-12-11 16:29:43 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-11 16:29:54 -0600 |
commit | 8186bd3db550d2a5cafd840679e8b13ff10a82b5 (patch) | |
tree | 32605706a6132580207f192c432618e8b301c3fd /linden/indra/newview | |
parent | Simplified release notes URL scheme. (diff) | |
download | meta-impy-8186bd3db550d2a5cafd840679e8b13ff10a82b5.zip meta-impy-8186bd3db550d2a5cafd840679e8b13ff10a82b5.tar.gz meta-impy-8186bd3db550d2a5cafd840679e8b13ff10a82b5.tar.bz2 meta-impy-8186bd3db550d2a5cafd840679e8b13ff10a82b5.tar.xz |
Indentation cleanup. (llviewernetwork.cpp)
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llviewernetwork.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 2b5cc0c..9019b88 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp | |||
@@ -110,34 +110,34 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name) | |||
110 | // The string can be: | 110 | // The string can be: |
111 | // - a grid label from the gGridInfo table | 111 | // - a grid label from the gGridInfo table |
112 | // - an ip address | 112 | // - an ip address |
113 | if(!grid_name.empty()) | 113 | if(!grid_name.empty()) |
114 | { | 114 | { |
115 | // find the grid choice from the user setting. | 115 | // find the grid choice from the user setting. |
116 | int grid_index = GRID_INFO_NONE; | 116 | int grid_index = GRID_INFO_NONE; |
117 | for(;grid_index < GRID_INFO_OTHER; ++grid_index) | 117 | for(;grid_index < GRID_INFO_OTHER; ++grid_index) |
118 | { | 118 | { |
119 | if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name)) | 119 | if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name)) |
120 | { | 120 | { |
121 | // Founding a matching label in the list... | 121 | // Founding a matching label in the list... |
122 | setGridChoice((EGridInfo)grid_index); | 122 | setGridChoice((EGridInfo)grid_index); |
123 | break; | 123 | break; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | if(GRID_INFO_OTHER == grid_index) | 127 | if(GRID_INFO_OTHER == grid_index) |
128 | { | 128 | { |
129 | // *FIX:MEP Can and should we validate that this is an IP address? | 129 | // *FIX:MEP Can and should we validate that this is an IP address? |
130 | mGridChoice = GRID_INFO_OTHER; | 130 | mGridChoice = GRID_INFO_OTHER; |
131 | mGridName = grid_name; | 131 | mGridName = grid_name; |
132 | gSavedSettings.setS32("ServerChoice", mGridChoice); | 132 | gSavedSettings.setS32("ServerChoice", mGridChoice); |
133 | gSavedSettings.setString("CustomServer", mGridName); | 133 | gSavedSettings.setString("CustomServer", mGridName); |
134 | } | 134 | } |
135 | } | 135 | } |
136 | } | 136 | } |
137 | 137 | ||
138 | void LLViewerLogin::resetURIs() | 138 | void LLViewerLogin::resetURIs() |
139 | { | 139 | { |
140 | // Clear URIs when picking a new server | 140 | // Clear URIs when picking a new server |
141 | gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray()); | 141 | gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray()); |
142 | gSavedSettings.setString("CmdLineHelperURI", ""); | 142 | gSavedSettings.setString("CmdLineHelperURI", ""); |
143 | } | 143 | } |