diff options
Diffstat (limited to 'OpenSim/Region')
3 files changed, 10 insertions, 8 deletions
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 | |||
5133 | if (lma == null) | 5133 | if (lma == null) |
5134 | { | 5134 | { |
5135 | // Failed to find landmark | 5135 | // Failed to find landmark |
5136 | |||
5137 | TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); | 5136 | TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); |
5138 | tpCancel.Info.SessionID = tpReq.Info.SessionID; | 5137 | tpCancel.Info.SessionID = tpReq.Info.SessionID; |
5139 | tpCancel.Info.AgentID = tpReq.Info.AgentID; | 5138 | tpCancel.Info.AgentID = tpReq.Info.AgentID; |
5140 | OutPacket(tpCancel, ThrottleOutPacketType.Task); | 5139 | OutPacket(tpCancel, ThrottleOutPacketType.Task); |
5141 | } | 5140 | } |
5142 | 5141 | ||
5143 | |||
5144 | try | 5142 | try |
5145 | { | 5143 | { |
5146 | lm = new AssetLandmark(lma); | 5144 | lm = new AssetLandmark(lma); |
@@ -5157,7 +5155,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5157 | } | 5155 | } |
5158 | else | 5156 | else |
5159 | { | 5157 | { |
5160 | |||
5161 | // Teleport home request | 5158 | // Teleport home request |
5162 | handlerTeleportHomeRequest = OnTeleportHomeRequest; | 5159 | handlerTeleportHomeRequest = OnTeleportHomeRequest; |
5163 | if (handlerTeleportHomeRequest != null) | 5160 | 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 | |||
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | /// <summary> | ||
61 | /// Called by code which actually renders the dynamic texture to supply texture data. | ||
62 | /// </summary> | ||
63 | /// <param name="id"></param> | ||
64 | /// <param name="data"></param> | ||
60 | public void ReturnData(LLUUID id, byte[] data) | 65 | public void ReturnData(LLUUID id, byte[] data) |
61 | { | 66 | { |
62 | if (Updaters.ContainsKey(id)) | 67 | if (Updaters.ContainsKey(id)) |
@@ -70,7 +75,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture | |||
70 | } | 75 | } |
71 | } | 76 | } |
72 | 77 | ||
73 | |||
74 | public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, | 78 | public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, |
75 | string extraParams, int updateTimer) | 79 | string extraParams, int updateTimer) |
76 | { | 80 | { |
@@ -196,11 +200,15 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture | |||
196 | BodyData = null; | 200 | BodyData = null; |
197 | } | 201 | } |
198 | 202 | ||
203 | /// <summary> | ||
204 | /// Called once new texture data has been received for this updater. | ||
205 | /// </summary> | ||
199 | public void DataReceived(byte[] data, Scene scene) | 206 | public void DataReceived(byte[] data, Scene scene) |
200 | { | 207 | { |
201 | SceneObjectPart part = scene.GetSceneObjectPart(PrimID); | 208 | SceneObjectPart part = scene.GetSceneObjectPart(PrimID); |
202 | byte[] assetData; | 209 | byte[] assetData; |
203 | AssetBase oldAsset = null; | 210 | AssetBase oldAsset = null; |
211 | |||
204 | if (BlendWithOldTexture) | 212 | if (BlendWithOldTexture) |
205 | { | 213 | { |
206 | LLUUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; | 214 | LLUUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID; |
@@ -234,7 +242,6 @@ namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture | |||
234 | 242 | ||
235 | LastAssetID = asset.FullID; | 243 | LastAssetID = asset.FullID; |
236 | 244 | ||
237 | |||
238 | part.Shape.Textures = new LLObject.TextureEntry(asset.FullID); | 245 | part.Shape.Textures = new LLObject.TextureEntry(asset.FullID); |
239 | part.ScheduleFullUpdate(); | 246 | part.ScheduleFullUpdate(); |
240 | } | 247 | } |
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 | |||
1481 | group.ApplyPhysics(m_physicalPrim); | 1481 | group.ApplyPhysics(m_physicalPrim); |
1482 | } | 1482 | } |
1483 | 1483 | ||
1484 | |||
1485 | group.StartScripts(); | 1484 | group.StartScripts(); |
1486 | 1485 | ||
1487 | |||
1488 | if (!attachment) | 1486 | if (!attachment) |
1489 | rootPart.ScheduleFullUpdate(); | 1487 | rootPart.ScheduleFullUpdate(); |
1490 | 1488 | ||
@@ -1493,6 +1491,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1493 | } | 1491 | } |
1494 | } | 1492 | } |
1495 | } | 1493 | } |
1494 | |||
1496 | return null; | 1495 | return null; |
1497 | } | 1496 | } |
1498 | 1497 | ||
@@ -1503,7 +1502,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1503 | { | 1502 | { |
1504 | LLUUID ownerID = item.OwnerID; | 1503 | LLUUID ownerID = item.OwnerID; |
1505 | 1504 | ||
1506 | |||
1507 | AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); | 1505 | AssetBase rezAsset = AssetCache.GetAsset(item.AssetID, false); |
1508 | 1506 | ||
1509 | if (rezAsset != null) | 1507 | if (rezAsset != null) |