diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 4fa604fc30..5536564233 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -27,6 +27,7 @@
using System;
using System.Collections;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.Drawing;
using System.Drawing.Imaging;
@@ -50,6 +51,7 @@ namespace OpenSim.Capabilities.Handlers
{
public class UploadBakedTextureHandler
{
+
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private Caps m_HostCapsObj;
@@ -79,9 +81,9 @@ namespace OpenSim.Capabilities.Handlers
{
string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-
+
BakedTextureUploader uploader =
- new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener);
+ new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
uploader.OnUpLoad += BakedTextureUploaded;
m_HostCapsObj.HttpListener.AddStreamHandler(
@@ -125,6 +127,7 @@ namespace OpenSim.Capabilities.Handlers
asset.Temporary = true;
asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are
m_assetService.Store(asset);
+
}
}
@@ -137,15 +140,19 @@ namespace OpenSim.Capabilities.Handlers
private string uploaderPath = String.Empty;
private UUID newAssetID;
private IHttpServer httpListener;
+ private UUID AgentId = UUID.Zero;
- public BakedTextureUploader(string path, IHttpServer httpServer)
+ public BakedTextureUploader(string path, IHttpServer httpServer, UUID uUID)
{
newAssetID = UUID.Random();
uploaderPath = path;
httpListener = httpServer;
+ AgentId = uUID;
// m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
}
+
+
///
/// Handle raw uploaded baked texture data.
///
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 4df4fb6717..ffc3527035 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -66,7 +66,9 @@ namespace OpenSim.Framework
protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f);
protected float m_avatarFeetOffset = 0;
protected float m_avatarAnimOffset = 0;
- protected WearableCacheItem[] cacheitems;
+ protected WearableCacheItem[] m_cacheitems;
+ protected bool m_cacheItemsDirty = true;
+
public virtual int Serial
{
get { return m_serial; }
@@ -118,8 +120,14 @@ namespace OpenSim.Framework
public virtual WearableCacheItem[] WearableCacheItems
{
- get { return cacheitems; }
- set { cacheitems = value; }
+ get { return m_cacheitems; }
+ set { m_cacheitems = value; }
+ }
+
+ public virtual bool WearableCacheItemsDirty
+ {
+ get { return m_cacheItemsDirty; }
+ set { m_cacheItemsDirty = value; }
}
public AvatarAppearance()
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index 83b1346230..1aecf79695 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -26,14 +26,132 @@
*/
using System;
+using System.Collections.Generic;
using OpenMetaverse;
+using OpenMetaverse.StructuredData;
namespace OpenSim.Framework
{
+ [Serializable]
public class WearableCacheItem
{
public uint TextureIndex { get; set; }
public UUID CacheId { get; set; }
public UUID TextureID { get; set; }
+ public AssetBase TextureAsset { get; set; }
+
+
+ public static WearableCacheItem[] GetDefaultCacheItem()
+ {
+ int itemmax = 21;
+ WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
+ for (uint i=0;i ret = new List();
+ if (pInput.Type == OSDType.Array)
+ {
+ OSDArray itemarray = (OSDArray) pInput;
+ foreach (OSDMap item in itemarray)
+ {
+ ret.Add(new WearableCacheItem()
+ {
+ TextureIndex = item["textureindex"].AsUInteger(),
+ CacheId = item["cacheid"].AsUUID(),
+ TextureID = item["textureid"].AsUUID()
+ });
+
+ if (dataCache != null && item.ContainsKey("assetdata"))
+ {
+ AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString());
+ asset.Temporary = true;
+ asset.Data = item["assetdata"].AsBinary();
+ dataCache.Cache(asset);
+ }
+ }
+ }
+ else if (pInput.Type == OSDType.Map)
+ {
+ OSDMap item = (OSDMap) pInput;
+ ret.Add(new WearableCacheItem(){
+ TextureIndex = item["textureindex"].AsUInteger(),
+ CacheId = item["cacheid"].AsUUID(),
+ TextureID = item["textureid"].AsUUID()
+ });
+ if (dataCache != null && item.ContainsKey("assetdata"))
+ {
+ string assetCreator = item["assetcreator"].AsString();
+ string assetName = item["assetname"].AsString();
+ AssetBase asset = new AssetBase(item["textureid"].AsUUID(), assetName, (sbyte)AssetType.Texture, assetCreator);
+ asset.Temporary = true;
+ asset.Data = item["assetdata"].AsBinary();
+ dataCache.Cache(asset);
+ }
+ }
+ else
+ {
+ return new WearableCacheItem[0];
+ }
+ return ret.ToArray();
+
+ }
+ public static OSD ToOSD(WearableCacheItem[] pcacheItems, IImprovedAssetCache dataCache)
+ {
+ OSDArray arr = new OSDArray();
+ foreach (WearableCacheItem item in pcacheItems)
+ {
+ OSDMap itemmap = new OSDMap();
+ itemmap.Add("textureindex", OSD.FromUInteger(item.TextureIndex));
+ itemmap.Add("cacheid", OSD.FromUUID(item.CacheId));
+ itemmap.Add("textureid", OSD.FromUUID(item.TextureID));
+ if (dataCache != null)
+ {
+ if (dataCache.Check(item.TextureID.ToString()))
+ {
+ AssetBase assetItem = dataCache.Get(item.TextureID.ToString());
+ if (assetItem != null)
+ {
+ itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));
+ itemmap.Add("assetcreator", OSD.FromString(assetItem.CreatorID));
+ itemmap.Add("assetname", OSD.FromString(assetItem.Name));
+ }
+ }
+ }
+ arr.Add(itemmap);
+ }
+ return arr;
+ }
+ public static WearableCacheItem SearchTextureIndex(uint pTextureIndex,WearableCacheItem[] pcacheItems)
+ {
+ for (int i = 0; i < pcacheItems.Length; i++)
+ {
+ if (pcacheItems[i].TextureIndex == pTextureIndex)
+ return pcacheItems[i];
+ }
+ return null;
+ }
+ public static WearableCacheItem SearchTextureCacheId(UUID pCacheId, WearableCacheItem[] pcacheItems)
+ {
+ for (int i = 0; i < pcacheItems.Length; i++)
+ {
+ if (pcacheItems[i].CacheId == pCacheId)
+ return pcacheItems[i];
+ }
+ return null;
+ }
+ public static WearableCacheItem SearchTextureTextureId(UUID pTextureId, WearableCacheItem[] pcacheItems)
+ {
+ for (int i = 0; i < pcacheItems.Length; i++)
+ {
+ if (pcacheItems[i].TextureID == pTextureId)
+ return pcacheItems[i];
+ }
+ return null;
+ }
}
+
+
}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index f6146a9171..b06788b199 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -103,6 +103,7 @@ namespace OpenSim.Region.ClientStack.Linden
private static readonly string m_getObjectPhysicsDataPath = "0101/";
private static readonly string m_getObjectCostPath = "0102/";
private static readonly string m_ResourceCostSelectedPath = "0103/";
+ private static readonly string m_UpdateAgentInformationPath = "0500/";
// These are callbacks which will be setup by the scene so that we can update scene data when we
@@ -287,6 +288,8 @@ namespace OpenSim.Region.ClientStack.Linden
m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler);
IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected);
m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler);
+ IRequestHandler UpdateAgentInformationHandler = new RestStreamHandler("POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation);
+ m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler);
m_HostCapsObj.RegisterHandler(
"CopyInventoryFromNotecard",
@@ -1438,6 +1441,22 @@ namespace OpenSim.Region.ClientStack.Linden
string response = OSDParser.SerializeLLSDXmlString(resp);
return response;
}
+
+ public string UpdateAgentInformation(string request, string path,
+ string param, IOSHttpRequest httpRequest,
+ IOSHttpResponse httpResponse)
+ {
+ OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+ OSDMap resp = new OSDMap();
+
+ OSDMap accessPrefs = new OSDMap();
+ accessPrefs["max"] = "A";
+
+ resp["access_prefs"] = accessPrefs;
+
+ string response = OSDParser.SerializeLLSDXmlString(resp);
+ return response;
+ }
}
public class AssetUploader
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 3b0ccd75ec..6bed95f369 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -27,6 +27,7 @@
using System;
using System.Collections;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.Drawing;
using System.Drawing.Imaging;
@@ -53,8 +54,8 @@ namespace OpenSim.Region.ClientStack.Linden
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UploadBakedTextureModule")]
public class UploadBakedTextureModule : INonSharedRegionModule
{
-// private static readonly ILog m_log =
-// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
///
/// For historical reasons this is fixed, but there
@@ -64,31 +65,195 @@ namespace OpenSim.Region.ClientStack.Linden
private Scene m_scene;
private bool m_persistBakedTextures;
+ private IBakedTextureModule m_BakedTextureModule;
+
public void Initialise(IConfigSource source)
{
IConfig appearanceConfig = source.Configs["Appearance"];
if (appearanceConfig != null)
m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
+
+
}
public void AddRegion(Scene s)
{
m_scene = s;
+
}
public void RemoveRegion(Scene s)
{
+ s.EventManager.OnRegisterCaps -= RegisterCaps;
+ s.EventManager.OnNewPresence -= RegisterNewPresence;
+ s.EventManager.OnRemovePresence -= DeRegisterPresence;
+ m_BakedTextureModule = null;
+ m_scene = null;
}
+
+
public void RegionLoaded(Scene s)
{
m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+ m_scene.EventManager.OnNewPresence += RegisterNewPresence;
+ m_scene.EventManager.OnRemovePresence += DeRegisterPresence;
+
+ }
+
+ private void DeRegisterPresence(UUID agentId)
+ {
+ ScenePresence presence = null;
+ if (m_scene.TryGetScenePresence(agentId, out presence))
+ {
+ presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
+ }
+
+ }
+
+ private void RegisterNewPresence(ScenePresence presence)
+ {
+ presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
+
+ }
+
+ private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
+ {
+ int maxCacheitemsLoop = cacheItems.Length;
+ if (maxCacheitemsLoop > AvatarWearable.MAX_WEARABLES)
+ {
+ maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
+ m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}. Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
+ }
+
+ m_BakedTextureModule = m_scene.RequestModuleInterface();
+ if (cacheItems.Length > 0)
+ {
+ m_log.Debug("[Cacheitems]: " + cacheItems.Length);
+ for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+ {
+ m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+ cacheItems[iter].TextureID);
+ }
+
+ ScenePresence p = null;
+ if (m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
+ {
+
+ WearableCacheItem[] existingitems = p.Appearance.WearableCacheItems;
+ if (existingitems == null)
+ {
+ if (m_BakedTextureModule != null)
+ {
+ WearableCacheItem[] savedcache = null;
+ try
+ {
+ if (p.Appearance.WearableCacheItemsDirty)
+ {
+ savedcache = m_BakedTextureModule.Get(p.UUID);
+ p.Appearance.WearableCacheItems = savedcache;
+ p.Appearance.WearableCacheItemsDirty = false;
+ }
+
+ }
+ /*
+ * The following Catch types DO NOT WORK with m_BakedTextureModule.Get
+ * it jumps to the General Packet Exception Handler if you don't catch Exception!
+ *
+ catch (System.Net.Sockets.SocketException)
+ {
+ cacheItems = null;
+ }
+ catch (WebException)
+ {
+ cacheItems = null;
+ }
+ catch (InvalidOperationException)
+ {
+ cacheItems = null;
+ } */
+ catch (Exception)
+ {
+ // The service logs a sufficient error message.
+ }
+
+
+ if (savedcache != null)
+ existingitems = savedcache;
+ }
+ }
+ // Existing items null means it's a fully new appearance
+ if (existingitems == null)
+ {
+
+ for (int i = 0; i < maxCacheitemsLoop; i++)
+ {
+ if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
+ {
+ cacheItems[i].TextureID =
+ textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID;
+ if (m_scene.AssetService != null)
+ cacheItems[i].TextureAsset =
+ m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
+ }
+ else
+ {
+ m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}. Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
+ }
+
+
+ }
+ }
+ else
+
+
+ {
+ // for each uploaded baked texture
+ for (int i = 0; i < maxCacheitemsLoop; i++)
+ {
+ if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
+ {
+ cacheItems[i].TextureID =
+ textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID;
+ }
+ else
+ {
+ m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}. Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
+ }
+ }
+
+ for (int i = 0; i < maxCacheitemsLoop; i++)
+ {
+ if (cacheItems[i].TextureAsset == null)
+ {
+ cacheItems[i].TextureAsset =
+ m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
+ }
+ }
+ }
+
+
+
+ p.Appearance.WearableCacheItems = cacheItems;
+
+
+
+ if (m_BakedTextureModule != null)
+ {
+ m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
+ p.Appearance.WearableCacheItemsDirty = true;
+
+ }
+ }
+ }
}
public void PostInitialise()
{
}
+
+
public void Close() { }
public string Name { get { return "UploadBakedTextureModule"; } }
@@ -100,15 +265,23 @@ namespace OpenSim.Region.ClientStack.Linden
public void RegisterCaps(UUID agentID, Caps caps)
{
+ UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
+ caps, m_scene.AssetService, m_persistBakedTextures);
+
+
+
caps.RegisterHandler(
"UploadBakedTexture",
new RestStreamHandler(
"POST",
"/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
- new UploadBakedTextureHandler(
- caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
+ avatarhandler.UploadBakedTexture,
"UploadBakedTexture",
agentID.ToString()));
+
+
+
+
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7364f45eb2..465d76db3f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3629,7 +3629,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
avp.Sender.IsTrial = false;
avp.Sender.ID = agentID;
- //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
+ m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
OutPacket(avp, ThrottleOutPacketType.State);
}
@@ -11725,32 +11725,134 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// var item = fac.GetBakedTextureFaces(AgentId);
//WearableCacheItem[] items = fac.GetCachedItems(AgentId);
- IImprovedAssetCache cache = m_scene.RequestModuleInterface();
- if (cache == null)
+ IAssetService cache = m_scene.AssetService;
+ IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface();
+ //bakedTextureModule = null;
+ int maxWearablesLoop = cachedtex.WearableData.Length;
+ if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
+ maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
+
+ if (bakedTextureModule != null && cache != null)
{
- for (int i = 0; i < cachedtex.WearableData.Length; i++)
+ // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
+
+ WearableCacheItem[] cacheItems = null;
+ ScenePresence p = m_scene.GetScenePresence(AgentId);
+ if (p.Appearance != null)
+ if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
+ {
+ try
+ {
+ cacheItems = bakedTextureModule.Get(AgentId);
+ p.Appearance.WearableCacheItems = cacheItems;
+ p.Appearance.WearableCacheItemsDirty = false;
+ }
+
+ /*
+ * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
+ *
+ catch (System.Net.Sockets.SocketException)
+ {
+ cacheItems = null;
+ }
+ catch (WebException)
+ {
+ cacheItems = null;
+ }
+ catch (InvalidOperationException)
+ {
+ cacheItems = null;
+ } */
+ catch (Exception)
+ {
+ cacheItems = null;
+ }
+
+ }
+ else if (p.Appearance.WearableCacheItems != null)
+ {
+ cacheItems = p.Appearance.WearableCacheItems;
+ }
+
+ if (cache != null && cacheItems != null)
{
- cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
- cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
- cachedresp.WearableData[i].TextureID = UUID.Zero; //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
- cachedresp.WearableData[i].HostName = new byte[0];
+ foreach (WearableCacheItem item in cacheItems)
+ {
+
+ if (cache.GetCached(item.TextureID.ToString()) == null)
+ {
+ item.TextureAsset.Temporary = true;
+ cache.Store(item.TextureAsset);
+ }
+
+
+ }
+ }
+
+ if (cacheItems != null)
+ {
+
+ for (int i = 0; i < maxWearablesLoop; i++)
+ {
+ WearableCacheItem item =
+ WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex,cacheItems);
+
+ cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+ cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex;
+ cachedresp.WearableData[i].HostName = new byte[0];
+ if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
+ {
+
+ cachedresp.WearableData[i].TextureID = item.TextureID;
+ }
+ else
+ {
+ cachedresp.WearableData[i].TextureID = UUID.Zero;
+ }
+ }
+ }
+ else
+ {
+ for (int i = 0; i < maxWearablesLoop; i++)
+ {
+ cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+ cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+ cachedresp.WearableData[i].TextureID = UUID.Zero;
+ //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+ cachedresp.WearableData[i].HostName = new byte[0];
+ }
}
}
else
{
- for (int i = 0; i < cachedtex.WearableData.Length; i++)
+ if (cache == null)
{
- cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
- cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-
-
-
- if (cache.Check(cachedtex.WearableData[i].ID.ToString()))
+ for (int i = 0; i < maxWearablesLoop; i++)
+ {
+ cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+ cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
cachedresp.WearableData[i].TextureID = UUID.Zero;
//UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
- else
- cachedresp.WearableData[i].TextureID = UUID.Zero; // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
- cachedresp.WearableData[i].HostName = new byte[0];
+ cachedresp.WearableData[i].HostName = new byte[0];
+ }
+ }
+ else
+ {
+ for (int i = 0; i < maxWearablesLoop; i++)
+ {
+ cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+ cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+
+
+
+ if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null)
+ cachedresp.WearableData[i].TextureID = UUID.Zero;
+ //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+ else
+ cachedresp.WearableData[i].TextureID = UUID.Zero;
+ // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+ cachedresp.WearableData[i].HostName = new byte[0];
+ }
}
}
cachedresp.Header.Zerocoded = true;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 3080023c0f..27cf20473a 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -205,10 +205,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// ((ScenePresence)sp).SetSize(box,off);
}
- //if (cacheItems.Length > 0)
- //{
- sp.Appearance.WearableCacheItems = cacheItems;
- //}
+
// Process the baked texture array
if (textureEntry != null)
{
@@ -284,8 +281,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public WearableCacheItem[] GetCachedItems(UUID agentId)
{
ScenePresence sp = m_scene.GetScenePresence(agentId);
- Dictionary bakedTextures = GetBakedTextureFaces(sp);
-
WearableCacheItem[] items = sp.Appearance.WearableCacheItems;
//foreach (WearableCacheItem item in items)
//{
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
index d63898acd8..21ed44ffdb 100644
--- a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -13,7 +13,7 @@ namespace OpenSim.Services.Interfaces
{
public interface IBakedTextureModule
{
- AssetBase[] Get(UUID id);
- void Store(UUID id, AssetBase[] data);
+ WearableCacheItem[] Get(UUID id);
+ void Store(UUID id, WearableCacheItem[] data);
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 54e3b2dec3..a5ef2b7128 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2982,6 +2982,7 @@ namespace OpenSim.Region.Framework.Scenes
// start the scripts again (since this is done in RezAttachments()).
// XXX: This is convoluted.
sp.IsChildAgent = false;
+ sp.IsLoggingIn = true;
if (AttachmentsModule != null)
Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e68793a19d..2a0d2eaa77 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool IsRoot
{
- get { return ParentGroup.RootPart == this; }
+ get { return Object.ReferenceEquals(ParentGroup.RootPart, this); }
}
///
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b9cd3fc561..1d6898bb4d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -225,8 +225,6 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool LandAtTarget { get; private set; }
- private bool m_followCamAuto;
-
private int m_movementUpdateCount;
private const int NumMovementsBetweenRayCast = 5;
@@ -355,6 +353,9 @@ namespace OpenSim.Region.Framework.Scenes
///
protected Vector3 m_lastCameraPosition;
+ private Vector4 m_lastCameraCollisionPlane = new Vector4(0f, 0f, 0f, 1);
+ private bool m_doingCamRayCast = false;
+
public Vector3 CameraPosition { get; set; }
public Quaternion CameraRotation
@@ -604,6 +605,7 @@ namespace OpenSim.Region.Framework.Scenes
}
public bool IsChildAgent { get; set; }
+ public bool IsLoggingIn { get; set; }
///
/// If the avatar is sitting, the local ID of the prim that it's sitting on. If not sitting then zero.
@@ -740,6 +742,7 @@ namespace OpenSim.Region.Framework.Scenes
AttachmentsSyncLock = new Object();
AllowMovement = true;
IsChildAgent = true;
+ IsLoggingIn = false;
m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
Animator = new ScenePresenceAnimator(this);
PresenceType = type;
@@ -912,6 +915,7 @@ namespace OpenSim.Region.Framework.Scenes
else
{
IsChildAgent = false;
+ IsLoggingIn = false;
}
@@ -1405,35 +1409,43 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
+ ///
+
+ private void UpdateCameraCollisionPlane(Vector4 plane)
+ {
+ if (m_lastCameraCollisionPlane != plane)
+ {
+ m_lastCameraCollisionPlane = plane;
+ ControllingClient.SendCameraConstraint(plane);
+ }
+ }
+
public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal)
{
const float POSITION_TOLERANCE = 0.02f;
- const float VELOCITY_TOLERANCE = 0.02f;
const float ROTATION_TOLERANCE = 0.02f;
- if (m_followCamAuto)
+ m_doingCamRayCast = false;
+ if (hitYN && localid != LocalId)
{
- if (hitYN)
- {
- CameraConstraintActive = true;
- //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance);
-
- Vector3 normal = Vector3.Normalize(new Vector3(0f, 0f, collisionPoint.Z) - collisionPoint);
- ControllingClient.SendCameraConstraint(new Vector4(normal.X, normal.Y, normal.Z, -1 * Vector3.Distance(new Vector3(0,0,collisionPoint.Z),collisionPoint)));
- }
- else
- {
- if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
- !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
- !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
- {
- if (CameraConstraintActive)
- {
- ControllingClient.SendCameraConstraint(new Vector4(0f, 0.5f, 0.9f, -3000f));
- CameraConstraintActive = false;
- }
- }
- }
+ CameraConstraintActive = true;
+ pNormal.X = (float)Math.Round(pNormal.X, 2);
+ pNormal.Y = (float)Math.Round(pNormal.Y, 2);
+ pNormal.Z = (float)Math.Round(pNormal.Z, 2);
+ pNormal.Normalize();
+ collisionPoint.X = (float)Math.Round(collisionPoint.X, 1);
+ collisionPoint.Y = (float)Math.Round(collisionPoint.Y, 1);
+ collisionPoint.Z = (float)Math.Round(collisionPoint.Z, 1);
+
+ Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, Vector3.Dot(collisionPoint, pNormal));
+ UpdateCameraCollisionPlane(plane);
+ }
+ else if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
+ !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
+ {
+ Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -9000f); // not right...
+ UpdateCameraCollisionPlane(plane);
+ CameraConstraintActive = false;
}
}
@@ -1508,12 +1520,6 @@ namespace OpenSim.Region.Framework.Scenes
// DrawDistance = agentData.Far;
DrawDistance = Scene.DefaultDrawDistance;
- // Check if Client has camera in 'follow cam' or 'build' mode.
- Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
-
- m_followCamAuto = ((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.98f)
- && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false;
-
m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
@@ -1533,24 +1539,38 @@ namespace OpenSim.Region.Framework.Scenes
StandUp();
}
- //m_log.DebugFormat("[FollowCam]: {0}", m_followCamAuto);
// Raycast from the avatar's head to the camera to see if there's anything blocking the view
- if ((m_movementUpdateCount % NumMovementsBetweenRayCast) == 0 && m_scene.PhysicsScene.SupportsRayCast())
+ // this exclude checks may not be complete
+
+ if (m_movementUpdateCount % NumMovementsBetweenRayCast == 0 && m_scene.PhysicsScene.SupportsRayCast())
{
- if (m_followCamAuto)
+ if (!m_doingCamRayCast && !m_mouseLook && ParentID == 0)
{
- // Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT;
- // m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback);
-
- Vector3 posAdjusted = AbsolutePosition + HEAD_ADJUSTMENT;
- Vector3 distTocam = CameraPosition - posAdjusted;
- float distTocamlen = distTocam.Length();
- if (distTocamlen > 0)
+ Vector3 posAdjusted = AbsolutePosition;
+// posAdjusted.Z += 0.5f * Appearance.AvatarSize.Z - 0.5f;
+ posAdjusted.Z += 1.0f; // viewer current camera focus point
+ Vector3 tocam = CameraPosition - posAdjusted;
+ tocam.X = (float)Math.Round(tocam.X, 1);
+ tocam.Y = (float)Math.Round(tocam.Y, 1);
+ tocam.Z = (float)Math.Round(tocam.Z, 1);
+
+ float distTocamlen = tocam.Length();
+ if (distTocamlen > 0.3f)
{
- distTocam *= 1.0f / distTocamlen;
- m_scene.PhysicsScene.RaycastWorld(posAdjusted, distTocam, distTocamlen + 0.3f, RayCastCameraCallback);
+ tocam *= (1.0f / distTocamlen);
+ posAdjusted.X = (float)Math.Round(posAdjusted.X, 1);
+ posAdjusted.Y = (float)Math.Round(posAdjusted.Y, 1);
+ posAdjusted.Z = (float)Math.Round(posAdjusted.Z, 1);
+
+ m_doingCamRayCast = true;
+ m_scene.PhysicsScene.RaycastWorld(posAdjusted, tocam, distTocamlen + 1.0f, RayCastCameraCallback);
}
-
+ }
+ else if (CameraConstraintActive && (m_mouseLook || ParentID != 0))
+ {
+ Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -10000f); // not right...
+ UpdateCameraCollisionPlane(plane);
+ CameraConstraintActive = false;
}
}
@@ -2265,7 +2285,6 @@ namespace OpenSim.Region.Framework.Scenes
ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
return;
}
-// m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString());
RemoveFromPhysicalScene();
@@ -2276,7 +2295,6 @@ namespace OpenSim.Region.Framework.Scenes
part.AddSittingAvatar(UUID);
-
Vector3 cameraAtOffset = part.GetCameraAtOffset();
Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
bool forceMouselook = part.GetForceMouselook();
@@ -2502,20 +2520,12 @@ namespace OpenSim.Region.Framework.Scenes
// NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
// grab the latest PhysicsActor velocity, whereas m_velocity is often
// storing a requested force instead of an actual traveling velocity
- if (Appearance.AvatarSize != m_lastSize)
- {
- m_lastSize = Appearance.AvatarSize;
+ if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
SendAvatarDataToAllAgents();
- }
- // Throw away duplicate or insignificant updates
- else if (
- // If the velocity has become zero, send it no matter what.
- (Velocity != m_lastVelocity && Velocity == Vector3.Zero)
- // otherwise, if things have changed reasonably, send the update
- || (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
- || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
- || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)))
+ if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
+ !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
+ !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
{
SendTerseUpdateToAllClients();
@@ -2704,6 +2714,8 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
+ m_lastSize = Appearance.AvatarSize;
+
int count = 0;
m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
{
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
index 6e9281b1be..7fe3109267 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
@@ -173,8 +173,13 @@ namespace OpenSim.Region.Physics.OdePlugin
d.GeomRaySetClosestHit(ray, closestHit);
if (req.callbackMethod is RaycastCallback)
+ {
// if we only want one get only one per Collision pair saving memory
CurrentRayFilter |= RayFilterFlags.ClosestHit;
+ d.GeomRaySetClosestHit(ray, 1);
+ }
+ else
+ d.GeomRaySetClosestHit(ray, closestHit);
}
if ((CurrentRayFilter & RayFilterFlags.ContactsUnImportant) != 0)
@@ -555,10 +560,13 @@ namespace OpenSim.Region.Physics.OdePlugin
ContactResult collisionresult = new ContactResult();
collisionresult.ConsumerID = ID;
- collisionresult.Pos = new Vector3(curcontact.pos.X, curcontact.pos.Y, curcontact.pos.Z);
+ collisionresult.Pos.X = curcontact.pos.X;
+ collisionresult.Pos.Y = curcontact.pos.Y;
+ collisionresult.Pos.Z = curcontact.pos.Z;
collisionresult.Depth = curcontact.depth;
- collisionresult.Normal = new Vector3(curcontact.normal.X, curcontact.normal.Y,
- curcontact.normal.Z);
+ collisionresult.Normal.X = curcontact.normal.X;
+ collisionresult.Normal.Y = curcontact.normal.Y;
+ collisionresult.Normal.Z = curcontact.normal.Z;
lock (m_contactResults)
{
m_contactResults.Add(collisionresult);
@@ -581,10 +589,13 @@ namespace OpenSim.Region.Physics.OdePlugin
if (curcontact.depth < collisionresult.Depth)
{
- collisionresult.Pos = new Vector3(curcontact.pos.X, curcontact.pos.Y, curcontact.pos.Z);
+ collisionresult.Pos.X = curcontact.pos.X;
+ collisionresult.Pos.Y = curcontact.pos.Y;
+ collisionresult.Pos.Z = curcontact.pos.Z;
collisionresult.Depth = curcontact.depth;
- collisionresult.Normal = new Vector3(curcontact.normal.X, curcontact.normal.Y,
- curcontact.normal.Z);
+ collisionresult.Normal.X = curcontact.normal.X;
+ collisionresult.Normal.Y = curcontact.normal.Y;
+ collisionresult.Normal.Z = curcontact.normal.Z;
}
}
@@ -699,10 +710,13 @@ namespace OpenSim.Region.Physics.OdePlugin
ContactResult collisionresult = new ContactResult();
collisionresult.ConsumerID = ID;
- collisionresult.Pos = new Vector3(curcontact.pos.X, curcontact.pos.Y, curcontact.pos.Z);
+ collisionresult.Pos.X = curcontact.pos.X;
+ collisionresult.Pos.Y = curcontact.pos.Y;
+ collisionresult.Pos.Z = curcontact.pos.Z;
collisionresult.Depth = curcontact.depth;
- collisionresult.Normal = new Vector3(curcontact.normal.X, curcontact.normal.Y,
- curcontact.normal.Z);
+ collisionresult.Normal.X = curcontact.normal.X;
+ collisionresult.Normal.Y = curcontact.normal.Y;
+ collisionresult.Normal.Z = curcontact.normal.Z;
lock (m_contactResults)
{
m_contactResults.Add(collisionresult);
@@ -725,10 +739,13 @@ namespace OpenSim.Region.Physics.OdePlugin
if (curcontact.depth < collisionresult.Depth)
{
- collisionresult.Pos = new Vector3(curcontact.pos.X, curcontact.pos.Y, curcontact.pos.Z);
+ collisionresult.Pos.X = curcontact.pos.X;
+ collisionresult.Pos.Y = curcontact.pos.Y;
+ collisionresult.Pos.Z = curcontact.pos.Z;
collisionresult.Depth = curcontact.depth;
- collisionresult.Normal = new Vector3(curcontact.normal.X, curcontact.normal.Y,
- curcontact.normal.Z);
+ collisionresult.Normal.X = curcontact.normal.X;
+ collisionresult.Normal.Y = curcontact.normal.Y;
+ collisionresult.Normal.Z = curcontact.normal.Z;
}
}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs
index ecc732a129..e9023c3221 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs
@@ -78,8 +78,12 @@ namespace OpenSim.Region.Physics.OdePlugin
IntPtr geom = ((OdePrim)actor).prim_geom;
- Vector3 geopos = d.GeomGetPositionOMV(geom);
- Quaternion geomOri = d.GeomGetQuaternionOMV(geom);
+// Vector3 geopos = d.GeomGetPositionOMV(geom);
+// Quaternion geomOri = d.GeomGetQuaternionOMV(geom);
+
+ Vector3 geopos = actor.Position;
+ Quaternion geomOri = actor.Orientation;
+
Quaternion geomInvOri = Quaternion.Conjugate(geomOri);
Quaternion ori = Quaternion.Identity;
@@ -116,6 +120,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
int status = 1;
+
offset = rayResults[0].Pos - geopos;
d.GeomClassID geoclass = d.GeomGetClass(geom);
@@ -191,13 +196,12 @@ namespace OpenSim.Region.Physics.OdePlugin
if (norm.Z < 0.5f)
{
float rayDist = 4.0f;
- float curEdgeDist = 0.0f;
for (int i = 0; i < 6; i++)
{
- pivot.X -= 0.005f * norm.X;
- pivot.Y -= 0.005f * norm.Y;
- pivot.Z -= 0.005f * norm.Z;
+ pivot.X -= 0.01f * norm.X;
+ pivot.Y -= 0.01f * norm.Y;
+ pivot.Z -= 0.01f * norm.Z;
rayDir.X = -norm.X * norm.Z;
rayDir.Y = -norm.Y * norm.Z;
@@ -208,8 +212,6 @@ namespace OpenSim.Region.Physics.OdePlugin
if (rayResults.Count == 0)
break;
- curEdgeDist += rayResults[0].Depth;
-
if (Math.Abs(rayResults[0].Normal.Z) < 0.7f)
{
rayDist -= rayResults[0].Depth;
@@ -226,7 +228,6 @@ namespace OpenSim.Region.Physics.OdePlugin
else
{
foundEdge = true;
- edgeDist = curEdgeDist;
edgePos = rayResults[0].Pos;
break;
}
@@ -254,7 +255,7 @@ namespace OpenSim.Region.Physics.OdePlugin
for (int i = 0; i < 3; i++)
{
- pivot.Z -= 0.005f;
+ pivot.Z -= 0.01f;
rayDir.X = toCamX;
rayDir.Y = toCamY;
rayDir.Z = (-toCamX * norm.X - toCamY * norm.Y) / norm.Z;
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index d045b59484..0d18adb04d 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -2586,7 +2586,7 @@ namespace OpenSim.Region.Physics.OdePlugin
req.Normal = direction;
req.Origin = position;
req.Count = 0;
- req.filter = RayFilterFlags.All;
+ req.filter = RayFilterFlags.AllPrims;
m_rayCastManager.QueueRequest(req);
}
@@ -2603,7 +2603,7 @@ namespace OpenSim.Region.Physics.OdePlugin
req.Normal = direction;
req.Origin = position;
req.Count = Count;
- req.filter = RayFilterFlags.All;
+ req.filter = RayFilterFlags.AllPrims;
m_rayCastManager.QueueRequest(req);
}
@@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Physics.OdePlugin
req.Normal = direction;
req.Origin = position;
req.Count = Count;
- req.filter = RayFilterFlags.All;
+ req.filter = RayFilterFlags.AllPrims;
lock (SyncObject)
{
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index aa389ba271..9ae9b59038 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2359,8 +2359,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
m_host.AddScriptLPS(1);
+
+ // Teravus: if (m_host.ParentID == 0) is bug code because the ParentID for the Avatar will cause this to be nonzero for root prim attachments
+ // which is then treated like a child prim rotation and it's offset gets cumulatively multiplied against.
+ // to fix the scripted rotations we also have to check to see if the root part localid is the same as the host's localid.
+ // RootPart != null should shortcircuit
+
// try to let this work as in SL...
- if (m_host.ParentID == 0)
+ if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
{
// special case: If we are root, rotate complete SOG to new rotation
SetRot(m_host, rot);
@@ -2443,6 +2449,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1);
Quaternion q = m_host.GetWorldRotation();
+
+ if (m_host.ParentGroup != null && m_host.ParentGroup.AttachmentPoint != 0)
+ {
+ ScenePresence avatar = World.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
+ if (avatar != null)
+ {
+ if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+ q = avatar.CameraRotation * q; // Mouselook
+ else
+ q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
+ }
+ }
+
return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
}
@@ -2468,7 +2487,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
q = part.ParentGroup.GroupRotation; // just the group rotation
return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
}
+
q = part.GetWorldRotation();
+ if (part.ParentGroup.AttachmentPoint != 0)
+ {
+ ScenePresence avatar = World.GetScenePresence(part.ParentGroup.AttachedAvatar);
+ if (avatar != null)
+ {
+ if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+ q = avatar.CameraRotation * q; // Mouselook
+ else
+ q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
+ }
+ }
+
return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
}
@@ -7909,7 +7941,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Rotation q = rules.GetQuaternionItem(idx++);
// try to let this work as in SL...
- if (part.ParentID == 0)
+ if (part.ParentID == 0 || (part.ParentGroup != null && part == part.ParentGroup.RootPart))
{
// special case: If we are root, rotate complete SOG to new rotation
SetRot(part, q);
@@ -8701,7 +8733,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_List remaining = GetPrimParams(m_host, rules, ref result);
- while (remaining != null && remaining.Length > 2)
+ while ((object)remaining != null && remaining.Length > 2)
{
int linknumber = remaining.GetLSLIntegerItem(0);
rules = remaining.GetSublist(1, -1);
@@ -8742,11 +8774,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
remaining = GetPrimParams(avatar, rules, ref res);
}
- if (remaining != null && remaining.Length > 0)
+ if ((object)remaining != null && remaining.Length > 0)
{
linknumber = remaining.GetLSLIntegerItem(0);
rules = remaining.GetSublist(1, -1);
}
+ else
+ break;
}
return res;