diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 7180078a4..ab40ae841 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -221,6 +221,10 @@ else (STANDALONE)
       )
 endif (STANDALONE)
 
+if($ENV{OPENSIM_RULES} EQUAL 1)
+	add_definitions(-DOPENSIM_RULES=1)
+endif($ENV{OPENSIM_RULES} EQUAL 1)
+
 if(SERVER)
   include_directories(${LIBS_PREBUILT_DIR}/include/havok)
 endif(SERVER)
diff --git a/indra/develop.py b/indra/develop.py
index 7cceb69a4..d86b86b48 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -80,7 +80,7 @@ class PlatformSetup(object):
     distcc = True
     cmake_opts = []
     word_size = 32
-    opensim_rules = False #whether or not to use rules fit for opensim
+    opensim_rules = 'OFF' #whether or not to use rules fit for opensim
     using_express = False
 
     def __init__(self):
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index e191e45e5..07d2e27bf 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -69,6 +69,11 @@
 #include "llui.h"
 #include "llweb.h"
 
+#if OPENSIM_RULES==1
+#include "llpreview.h"
+#include "llpreviewtexture.h"
+#endif /* OPENSIM_RULES==1 */
+
 extern void handle_buy(void*);
 
 extern BOOL gDebugClicks;
@@ -158,8 +163,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 	LLViewerObject *object = mPick.getObject();
 	LLViewerObject *parent = NULL;
 
-#ifdef OPENSIM_RULES
-#warn "DICKS IN MY BUTT"
+#if OPENSIM_RULES==1
 	if(mPick.mKeyMask == MASK_SHIFT)
 	{
 		if(object)
@@ -171,13 +175,34 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 				if(img)
 				{
 					LLUUID image_id = img->getID();
-					LLInventoryBridge::open_texture(image_id, std::string(image_id), true, LLUUID::null ,true);
+					
+					// See if we can bring an exiting preview to the front
+					if( !LLPreview::show( image_id, true ) )
+					{
+						// There isn't one, so make a new preview
+						S32 left, top;
+						gFloaterView->getNewFloaterPosition(&left, &top);
+						LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+						rect.translate( left - rect.mLeft, top - rect.mTop );
+
+						LLPreviewTexture* preview;
+						preview = new LLPreviewTexture("preview texture",
+														  rect,
+														  image_id.getString(),
+														  image_id,
+														  LLUUID::null,
+														  true);
+						preview->setSourceID(image_id);
+						preview->setFocus(TRUE);
+
+						gFloaterView->adjustToFitScreen(preview, FALSE);
+					}
 				}
 			}
 		}
 		return TRUE;
 	}
-#endif /* OPENSIM_RULES */
+#endif /* OPENSIM_RULES==1 */
 
 	if (mPick.mPickType != LLPickInfo::PICK_LAND)
 	{