From 4a6bacea0f8dcff959028f285bc533852da608b5 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 28 Aug 2008 23:57:41 +0000 Subject: 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 --- indra/newview/llpanellogin.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llpanellogin.cpp') 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; -- cgit v1.2.3