From 4dd523b45d1e635c66eb4e556764fabe29dbfc58 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 15:34:56 -0800
Subject: * Changed IPresenceService Logout, so that it takes a position and a
 lookat * CommsManager.AvatarService rerouted

---
 OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs  |  9 ++------
 .../Rest/Inventory/RestAppearanceServices.cs       | 26 +++++++++++++---------
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/Rest')

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index 791cfcd..c40ea0e 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Services.Interfaces;
 using IUserService = OpenSim.Framework.Communications.IUserService;
-using IAvatarService = OpenSim.Framework.Communications.IAvatarService;
+using IAvatarService = OpenSim.Services.Interfaces.IAvatarService;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
@@ -93,11 +93,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         /// initializes.
         /// </summary>
 
-        internal static CommunicationsManager Comms
-        {
-            get { return main.CommunicationsManager; }
-        }
-
         internal static IInventoryService InventoryServices
         {
             get { return main.SceneManager.CurrentOrFirstScene.InventoryService; }
@@ -115,7 +110,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
         
         internal static IAvatarService AvatarServices
         {
-            get { return Comms.AvatarService; }
+            get { return main.SceneManager.CurrentOrFirstScene.AvatarService; }
         }
 
         internal static IAssetService AssetServices
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 0a45eff..5429890 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -32,6 +32,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.ApplicationPlugins.Rest.Inventory
 {
@@ -295,15 +296,15 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         private void DoGet(AppearanceRequestData rdata)
         {
+            AvatarData adata = Rest.AvatarServices.GetAvatar(rdata.userProfile.ID);
 
-            rdata.userAppearance = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
-
-            if (rdata.userAppearance == null)
+            if (adata == null)
             {
                 rdata.Fail(Rest.HttpStatusCodeNoContent,
                     String.Format("appearance data not found for user {0} {1}", 
                       rdata.userProfile.FirstName, rdata.userProfile.SurName));
             }
+            rdata.userAppearance = adata.ToAvatarAppearance();
 
             rdata.initXmlWriter();
 
@@ -342,18 +343,20 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
             //  increasingly doubtful that it is appropriate for REST. If I attempt to
             //  add a new record, and it already exists, then it seems to me that the
             //  attempt should fail, rather than update the existing record.
-
+            AvatarData adata = null;
             if (GetUserAppearance(rdata))
             {
                 modified = rdata.userAppearance != null;
                 created  = !modified;
-                Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance);
+                adata = new AvatarData(rdata.userAppearance);
+                Rest.AvatarServices.SetAvatar(rdata.userProfile.ID, adata);
             //    Rest.UserServices.UpdateUserProfile(rdata.userProfile);
             }
             else
             {
                 created  = true;
-                Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance);
+                adata = new AvatarData(rdata.userAppearance);
+                Rest.AvatarServices.SetAvatar(rdata.userProfile.ID, adata);
              //   Rest.UserServices.UpdateUserProfile(rdata.userProfile);
             }
 
@@ -439,21 +442,22 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
         private void DoDelete(AppearanceRequestData rdata)
         {
+            AvatarData adata = Rest.AvatarServices.GetAvatar(rdata.userProfile.ID);
 
-            AvatarAppearance old = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
-
-            if (old != null)
+            if (adata != null)
             {
+                AvatarAppearance old = adata.ToAvatarAppearance();
                 rdata.userAppearance = new AvatarAppearance();
-
                 rdata.userAppearance.Owner = old.Owner;
+                adata = new AvatarData(rdata.userAppearance);
                 
-                Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance);
+                Rest.AvatarServices.SetAvatar(rdata.userProfile.ID, adata);
 
                 rdata.Complete();
             }
             else
             {
+
                 rdata.Complete(Rest.HttpStatusCodeNoContent);
             }
 
-- 
cgit v1.1