From 682fc23e3216b3319f532d9e0a4a8e63c55ce264 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sun, 18 May 2008 19:51:58 +0000
Subject: * minor: Just a few documentation odds and ends
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 3 ---
.../Modules/Scripting/DynamicTexture/DynamicTextureModule.cs | 11 +++++++++--
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 +---
3 files changed, 10 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index fa608a9..6c891ab 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5133,14 +5133,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (lma == null)
{
// Failed to find landmark
-
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel);
tpCancel.Info.SessionID = tpReq.Info.SessionID;
tpCancel.Info.AgentID = tpReq.Info.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
}
-
try
{
lm = new AssetLandmark(lma);
@@ -5157,7 +5155,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
else
{
-
// Teleport home request
handlerTeleportHomeRequest = OnTeleportHomeRequest;
if (handlerTeleportHomeRequest != null)
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
index c0e3d3b..c22d1c6 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
}
}
+ ///
+ /// Called by code which actually renders the dynamic texture to supply texture data.
+ ///
+ ///
+ ///
public void ReturnData(LLUUID id, byte[] data)
{
if (Updaters.ContainsKey(id))
@@ -70,7 +75,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
}
}
-
public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url,
string extraParams, int updateTimer)
{
@@ -196,11 +200,15 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
BodyData = null;
}
+ ///
+ /// Called once new texture data has been received for this updater.
+ ///
public void DataReceived(byte[] data, Scene scene)
{
SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
byte[] assetData;
AssetBase oldAsset = null;
+
if (BlendWithOldTexture)
{
LLUUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID;
@@ -234,7 +242,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
LastAssetID = asset.FullID;
-
part.Shape.Textures = new LLObject.TextureEntry(asset.FullID);
part.ScheduleFullUpdate();
}
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 8b94100..0ab8779 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1481,10 +1481,8 @@ namespace OpenSim.Region.Environment.Scenes
group.ApplyPhysics(m_physicalPrim);
}
-
group.StartScripts();
-
if (!attachment)
rootPart.ScheduleFullUpdate();
@@ -1493,6 +1491,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
+
return null;
}
@@ -1503,7 +1502,6 @@ namespace OpenSim.Region.Environment.Scenes
{
LLUUID ownerID = item.OwnerID;
-
AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false);
if (rezAsset != null)
--
cgit v1.1