Merge branch 'master' of ssh://MyConnection/var/git/opensim

6 files changed, 14 insertions, 7 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 7270f32..1fb01ba 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -503,7 +503,14 @@ namespace OpenSim.Framework
             Owner = new UUID((string)h["owner"]);
             Serial = Convert.ToInt32((string)h["serial"]);
             VisualParams = (byte[])h["visual_params"];
-            Texture = new Primitive.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length);
+
+            if (h.Contains("texture"))
+            {
+                byte[] te = h["texture"] as byte[];
+                if (te != null && te.Length > 0)
+                    Texture = new Primitive.TextureEntry(te, 0, te.Length);
+            }
+            
             AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);
 
             m_wearables = new AvatarWearable[MAX_WEARABLES];
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index c9f5236..7f1c7e9 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Communications.Cache
         // Commented out for now.  The implementation needs to be improved by protecting against race conditions,
         // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via
         // returning a read only class from the cache).
-//        public bool UpdateProfile(UserProfileData userProfile)
+//        public bool StoreProfile(UserProfileData userProfile)
 //        {            
 //            lock (m_userProfilesById)
 //            {            
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 670c9ff..933fa12 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -110,14 +110,14 @@ namespace OpenSim.Framework.Communications.Tests
             IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
 
             // Check that we can't update info before it exists
-            Assert.That(userCacheService.UpdateProfile(newProfile), Is.False);
+            Assert.That(userCacheService.StoreProfile(newProfile), Is.False);
             Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null);
 
             // Check that we can update a profile once it exists
             LocalUserServices lus = (LocalUserServices)commsManager.UserService;
             lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId);
 
-            Assert.That(userCacheService.UpdateProfile(newProfile), Is.True);
+            Assert.That(userCacheService.StoreProfile(newProfile), Is.True);
             UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile;
             Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName));
             Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName));
diff --git a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
index bc046cf..c6958de 100644
--- a/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/GetAssetStreamHandler.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
 
         protected override AssetBase GetAsset(UUID assetID)
         {
-            return m_assetProvider.FetchAsset(assetID);
+            return m_assetProvider.GetAsset(assetID);
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
index 419b408..8bf406c 100644
--- a/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/PostAssetStreamHandler.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Servers
             AssetBase asset = (AssetBase) xs.Deserialize(request);
 
             m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
-            m_assetProvider.CreateAsset(asset);
+            m_assetProvider.StoreAsset(asset);
 
             return new byte[] {};
         }
diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
index 35da73f..be3f518 100644
--- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
+++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.Servers.Tests
             IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin();
             handler = new GetAssetStreamHandler(assetDataPlugin);
 
-            assetDataPlugin.CreateAsset(asset);
+            assetDataPlugin.StoreAsset(asset);
             return asset;
         }
     }