From b4680f653dbc1c6f712898af79c4ea22bca3f678 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 17 Dec 2008 16:11:03 +0000
Subject: * Implement 'Save Object Back to My Inventory'.  On the Linden client
 this is in the Tools menu available when editing an object * This facility
 allows you to save changes to an object that you've rezzed into a region back
 into their original inventory item without having to take a copy of the
 rezzed object.

---
 OpenSim/Framework/Communications/IUserService.cs | 3 ++-
 OpenSim/Framework/IClientAPI.cs                  | 2 +-
 OpenSim/Framework/IScene.cs                      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index ecbbd32..206fb1e 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -109,7 +109,8 @@ namespace OpenSim.Framework.Communications
         void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz);
 
         /// <summary>
-        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
+        /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship 
+        /// for UUID friendslistowner
         /// </summary>
         /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
         List<FriendListItem> GetUserFriendList(UUID friendlistowner);
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 751a2a5..a9c05f6 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -767,7 +767,7 @@ namespace OpenSim.Framework
         void SendWindData(Vector2[] windSpeeds);
 
         void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
-        void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
+        void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);        
         AgentCircuitData RequestClientInfo();
 
         void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint,
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 6a6fdf1..5978245 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Framework
     /// </value>
     public enum DeRezAction : byte
     {
+        SaveToExistingUserInventoryItem = 0,
         TakeCopy = 1,
         Take = 4,
         GodTakeCopy = 5,
-- 
cgit v1.1