diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d3d5f1dbf..f6828bc36 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12111,17 +12111,6 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>ReSit</key>
-    <map>
-      <key>Comment</key>
-      <string>Sit again if unsat</string>
-      <key>Persist</key>
-      <integer>0</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>SpecifiedChannel</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 61b771ea2..2d205b2f4 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -126,10 +126,6 @@ const F32 MAX_FIDGET_TIME = 20.f; // seconds
 LLAgent gAgent;
 std::string gAuthString;
 
-// <edit>
-LLUUID gReSitTargetID;
-LLVector3 gReSitOffset;
-// </edit>
 class LLTeleportRequest
 {
 public:
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 67dd6a3ff..ddb68ddb1 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -959,9 +959,5 @@ extern LLAgentQueryManager gAgentQueryManager;
 
 extern std::string gAuthString;
 
-// <edit>
-extern LLUUID gReSitTargetID;
-extern LLVector3 gReSitOffset;
-// </edit>
 void update_group_floaters(const LLUUID& group_id);
 #endif
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a58e8ecf2..4d3fe16cc 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -819,11 +819,6 @@ void init_menus()
 										NULL,
 										&menu_check_control,
 										(void*)"Nimble"));
-	menu->addChild(new LLMenuItemCheckGL( "ReSit",
-										&menu_toggle_control,
-										NULL,
-										&menu_check_control,
-										(void*)"ReSit"));
 	menu->addSeparator();
 	menu->addChild(new LLMenuItemCallGL(	"Object Area Search", &handle_area_search, NULL));
 
@@ -4038,11 +4033,6 @@ bool handle_sit_or_stand()
 			gRlvHandler.setSitSource(gAgent.getPositionGlobal());
 		}
 // [/RLVa:KB]
-
-		// <edit>
-		gReSitTargetID = object->mID;
-		gReSitOffset = pick.mObjectOffset;
-		// </edit>
 		gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
 		gMessageSystem->nextBlockFast(_PREHASH_AgentData);
 		gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 82b6679f6..557545dcb 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2789,28 +2789,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
 		}
 	}
 
-	//llinfos << getRotation() << llendl;
-	//llinfos << getPosition() << llendl;
-	// <edit>
-	if (update_type == OUT_FULL )
-	{
-		
-		if(isSelf())
-		{
-			if(gSavedSettings.getBOOL("ReSit"))
-			{
-				gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
-				gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-				gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-				gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-				gMessageSystem->nextBlockFast(_PREHASH_TargetObject);
-				gMessageSystem->addUUIDFast(_PREHASH_TargetID, gReSitTargetID);
-				gMessageSystem->addVector3Fast(_PREHASH_Offset, gReSitOffset);
-				gAgent.getRegion()->sendReliableMessage();
-			}
-		}
-	}
-	// </edit>
 	return retval;
 }