2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index baa3478..73d2436 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,11 @@
 
 2009-11-09 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Removed deprecated EGridInfo from llloginhandler.
+        
+          modified:   linden/indra/newview/llloginhandler.cpp
+          
+          
         * Updated primbackup from latest meerkat svn (r246).
         
           modified:   linden/indra/newview/primbackup.cpp
diff --git a/linden/indra/newview/llloginhandler.cpp b/linden/indra/newview/llloginhandler.cpp
index f409ddc..6366398 100644
--- a/linden/indra/newview/llloginhandler.cpp
+++ b/linden/indra/newview/llloginhandler.cpp
@@ -75,8 +75,8 @@ void LLLoginHandler::parse(const LLSD& queryMap)
         mFirstName = queryMap["first_name"].asString();
         mLastName = queryMap["last_name"].asString();
         
-
-        EGridInfo grid_choice = GRID_INFO_NONE;
+        // Deprecated in favor of the new grid manager - MC
+        /*EGridInfo grid_choice = GRID_INFO_NONE;
         if (queryMap["grid"].asString() == "sl beta grid")
         {
                 grid_choice = GRID_INFO_ADITI;
@@ -89,7 +89,7 @@ void LLLoginHandler::parse(const LLSD& queryMap)
         if(grid_choice != GRID_INFO_NONE)
         {
                 LLViewerLogin::getInstance()->setGridChoice(grid_choice);
-        }
+        }*/
 
         std::string startLocation = queryMap["location"].asString();