diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/llpanellogin.cpp | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index d01721984a..f7f46b0c30 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -146,6 +146,10 @@ void LLLoginHandler::parse(const LLSD& queryMap) { grid_choice = GRID_INFO_SIVA; } + else if (queryMap["grid"].asString() == "damballah") + { + grid_choice = GRID_INFO_DAMBALLAH; + } else if (queryMap["grid"].asString() == "durga") { grid_choice = GRID_INFO_DURGA; |