From 32e8b6d19a39b7a4e8d3e95f07a8172fab60f37e Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Wed, 13 Feb 2013 21:48:09 -0700
Subject: [PATCH] Experimentally add lsl bridge support on Aurora-sim

---
 indra/newview/llstartup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index f19141dc31..f1919d1762 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2436,7 +2436,7 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
 
 // <FS:AW Disable LSL bridge on opensim>
 #ifdef HAS_OPENSIM_SUPPORT // <FS:AW optional opensim support/>
-		if (LLGridManager::getInstance()->isInOpenSim())
+		if (LLGridManager::getInstance()->isInOpenSim()  && !LLGridManager::getInstance()->isInAuroraSim())
 		{
 			LLControlVariable* use_bridge = gSavedSettings.getControl("UseLSLBridge");
 			use_bridge->setValue(LLSD(FALSE), FALSE);