diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d10ceb0d8..ca1deb3e7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -253,17 +253,6 @@
 		<integer>1</integer>
 		</map>
 
-    <key>BeauchampUseInventoryLinks</key>
-    <map>
-      <key>Comment</key>
-      <string>When making a new outfit, use links for no-copy items</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>MoyFastMiniMap</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 1e455d9b3..f3dc53305 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -140,6 +140,8 @@
 #include "llviewerjoystick.h"
 #include "llfollowcam.h"
 
+#include "hippogridmanager.h"
+
 // [RLVa:KB] - Checked: 2010-09-27 (RLVa-1.1.3b)
 #include "rlvhandler.h"
 #include "rlvinventory.h"
@@ -7346,7 +7348,8 @@ void LLAgent::makeNewOutfit(
 		return;
 	}
 
-	BOOL fUseLinks = !gSavedSettings.getBOOL("UseInventoryLinks");
+	BOOL fUseLinks = !gSavedSettings.getBOOL("UseInventoryLinks") &&
+					 gHippoGridManager->getConnectedGrid()->isSecondLife();
 	BOOL fUseOutfits = gSavedSettings.getBOOL("UseOutfitFolders");
 
 	LLAssetType::EType typeDest = (fUseOutfits) ? LLAssetType::AT_MY_OUTFITS : LLAssetType::AT_CLOTHING;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ba27e343e..063be4f1d 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -109,6 +109,8 @@
 #include "llviewerjoystick.h"
 #include "lltoolmgr.h"
 
+#include "hippogridmanager.h"
+
 // [RLVa:KB]
 #include "rlvhandler.h"
 #include "llattachmentsmgr.h"
@@ -526,6 +528,10 @@ BOOL LLInvFVBridge::isClipboardPasteable() const
 
 BOOL LLInvFVBridge::isClipboardPasteableAsLink() const
 {
+	if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
+	{
+		return FALSE;
+	}
 	if (!LLInventoryClipboard::instance().hasContents() || !isAgentInventory())
 	{
 		return FALSE;
@@ -1376,11 +1382,14 @@ BOOL LLItemBridge::isItemCopyable() const
 	LLViewerInventoryItem* item = getItem();
 	if (item && !item->getIsLinkType())
 	{
-		// All items can be copied since you can
-		// at least paste-as-link the item, though you 
-		// still may not be able paste the item.
-		return TRUE;
-//		return (item->getPermissions().allowCopyBy(gAgent.getID()));
+		if(!gHippoGridManager->getConnectedGrid()->isSecondLife()) {
+			return (item->getPermissions().allowCopyBy(gAgent.getID()));
+		} else {
+			// All items can be copied since you can
+			// at least paste-as-link the item, though you 
+			// still may not be able paste the item.
+			return TRUE;
+		}
 	}
 	return FALSE;
 }
@@ -2392,7 +2401,8 @@ void LLFolderBridge::folderOptionsMenu()
 			if(!(LLXmlImport::sImportInProgress && LLXmlImport::sImportHasAttachments))
 			{
 			// </edit>
-				mItems.push_back(std::string("Add To Outfit"));
+				if (gHippoGridManager->getConnectedGrid()->isSecondLife())
+					mItems.push_back(std::string("Add To Outfit"));
 				mItems.push_back(std::string("Wear Items"));
 				mItems.push_back(std::string("Replace Outfit"));
 			// <edit>
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 64f5de223..ba8ef3eff 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -87,6 +87,7 @@
 #include "pipeline.h"
 
 #include "llglheaders.h"
+#include "hippogridmanager.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -3595,7 +3596,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
 	if (0 == attachment_point ||
 		get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL))
 	{
-		if (attachment_point != 0)
+		if (attachment_point != 0 && gHippoGridManager->getConnectedGrid()->isSecondLife())
 		{
 			// If we know the attachment point then we got here by clicking an
 			// "Attach to..." context menu item, so we should add, not replace.
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 241240be1..ac5906a44 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -647,15 +647,6 @@ public:
 	std::string 	mClientTag; //Zwagoth's new client identification system. -HgB
 	LLColor4 		mClientColor; //Zwagoth's new client identification system. -HgB
 
-
-
-
-
-
-
-
-
-
 	//--------------------------------------------------------------------
 	// Private member variables.
 	//--------------------------------------------------------------------