OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: Just a few documentation odds and ends

0.6.0-stable
Justin Clarke Casey 2008-05-18 19:51:58 +00:00
parent aa5b26a4d3
commit 682fc23e32
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -5133,14 +5133,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (lma == null) if (lma == null)
{ {
// Failed to find landmark // Failed to find landmark
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel);
tpCancel.Info.SessionID = tpReq.Info.SessionID; tpCancel.Info.SessionID = tpReq.Info.SessionID;
tpCancel.Info.AgentID = tpReq.Info.AgentID; tpCancel.Info.AgentID = tpReq.Info.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task); OutPacket(tpCancel, ThrottleOutPacketType.Task);
} }
try try
{ {
lm = new AssetLandmark(lma); lm = new AssetLandmark(lma);
@ -5157,7 +5155,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
else else
{ {
// Teleport home request // Teleport home request
handlerTeleportHomeRequest = OnTeleportHomeRequest; handlerTeleportHomeRequest = OnTeleportHomeRequest;
if (handlerTeleportHomeRequest != null) if (handlerTeleportHomeRequest != null)

11
OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@ -57,6 +57,11 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
} }
} }
/// <summary>
/// Called by code which actually renders the dynamic texture to supply texture data.
/// </summary>
/// <param name="id"></param>
/// <param name="data"></param>
public void ReturnData(LLUUID id, byte[] data) public void ReturnData(LLUUID id, byte[] data)
{ {
if (Updaters.ContainsKey(id)) 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, public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url,
string extraParams, int updateTimer) string extraParams, int updateTimer)
{ {
@ -196,11 +200,15 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
BodyData = null; BodyData = null;
} }
/// <summary>
/// Called once new texture data has been received for this updater.
/// </summary>
public void DataReceived(byte[] data, Scene scene) public void DataReceived(byte[] data, Scene scene)
{ {
SceneObjectPart part = scene.GetSceneObjectPart(PrimID); SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
byte[] assetData; byte[] assetData;
AssetBase oldAsset = null; AssetBase oldAsset = null;
if (BlendWithOldTexture) if (BlendWithOldTexture)
{ {
LLUUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; LLUUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID;
@ -234,7 +242,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
LastAssetID = asset.FullID; LastAssetID = asset.FullID;
part.Shape.Textures = new LLObject.TextureEntry(asset.FullID); part.Shape.Textures = new LLObject.TextureEntry(asset.FullID);
part.ScheduleFullUpdate(); part.ScheduleFullUpdate();
} }

4
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1481,10 +1481,8 @@ namespace OpenSim.Region.Environment.Scenes
group.ApplyPhysics(m_physicalPrim); group.ApplyPhysics(m_physicalPrim);
} }
group.StartScripts(); group.StartScripts();
if (!attachment) if (!attachment)
rootPart.ScheduleFullUpdate(); rootPart.ScheduleFullUpdate();
@ -1493,6 +1491,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
} }
return null; return null;
} }
@ -1503,7 +1502,6 @@ namespace OpenSim.Region.Environment.Scenes
{ {
LLUUID ownerID = item.OwnerID; LLUUID ownerID = item.OwnerID;
AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false);
if (rezAsset != null) if (rezAsset != null)