From 0c1707ad7ee7a9a84e170232fd947cdcfeeba368 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax <arminweatherwax@lavabit.com>
Date: Mon, 25 Jun 2012 10:57:53 +0200
Subject: [PATCH] work around FIRE-6738

---
 indra/newview/llfloaterpreference.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 37a29cd707..d48601ecc7 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2803,7 +2803,8 @@ void LLPanelPreferenceOpensim::apply()
 
 void LLPanelPreferenceOpensim::cancel()
 {
-	LLGridManager::getInstance()->initGrids();
+	// AW: commented out for avoiding FIRE-6738
+	//LLGridManager::getInstance()->initGrids();
 }
 
 void LLPanelPreferenceOpensim::onClickAddGrid()