diff options
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 3 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/peaches.jp2 | bin | 98845 -> 0 bytes | |||
-rwxr-xr-x | bin/libdb_dotNET43.dll | bin | 221184 -> 0 bytes |
8 files changed, 12 insertions, 23 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 11d3e36..30f4495 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -598,8 +598,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
598 | /// <summary> | 598 | /// <summary> |
599 | /// Add a handler for the given packet type. | 599 | /// Add a handler for the given packet type. |
600 | /// </summary> | 600 | /// </summary> |
601 | /// <remarks>The packet is handled on its own thread. If packets must be handled in the order in which thye | 601 | /// <remarks> |
602 | /// are received then please us ethe synchronous version of this method.</remarks> | 602 | /// The packet is handled on its own thread. If packets must be handled in the order in which thye |
603 | /// are received then please use the synchronous version of this method. | ||
604 | /// </remarks> | ||
603 | /// <param name="packetType"></param> | 605 | /// <param name="packetType"></param> |
604 | /// <param name="handler"></param> | 606 | /// <param name="handler"></param> |
605 | /// <returns>true if the handler was added. This is currently always the case.</returns> | 607 | /// <returns>true if the handler was added. This is currently always the case.</returns> |
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 2efb269..acf36df 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -150,13 +150,13 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
150 | changed = sp.Appearance.SetTextureEntries(textureEntry) || changed; | 150 | changed = sp.Appearance.SetTextureEntries(textureEntry) || changed; |
151 | 151 | ||
152 | m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID); | 152 | m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID); |
153 | Util.FireAndForget(delegate(object o) { ValidateBakedTextureCache(sp, false); }); | 153 | ValidateBakedTextureCache(sp, false); |
154 | 154 | ||
155 | // This appears to be set only in the final stage of the appearance | 155 | // This appears to be set only in the final stage of the appearance |
156 | // update transaction. In theory, we should be able to do an immediate | 156 | // update transaction. In theory, we should be able to do an immediate |
157 | // appearance send and save here. | 157 | // appearance send and save here. |
158 | |||
159 | } | 158 | } |
159 | |||
160 | // save only if there were changes, send no matter what (doesn't hurt to send twice) | 160 | // save only if there were changes, send no matter what (doesn't hurt to send twice) |
161 | if (changed) | 161 | if (changed) |
162 | QueueAppearanceSave(sp.ControllingClient.AgentId); | 162 | QueueAppearanceSave(sp.ControllingClient.AgentId); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index cf2161a..67eafd5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1724,6 +1724,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1724 | 1724 | ||
1725 | #endregion | 1725 | #endregion |
1726 | 1726 | ||
1727 | // Send the parts of this SOG to a single client | ||
1728 | // Used when the client initially connects and when client sends RequestPrim packet | ||
1727 | public void SendFullUpdateToClient(IClientAPI remoteClient) | 1729 | public void SendFullUpdateToClient(IClientAPI remoteClient) |
1728 | { | 1730 | { |
1729 | RootPart.SendFullUpdate( | 1731 | RootPart.SendFullUpdate( |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 428fe1c..666ce2a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -269,8 +269,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
269 | 269 | ||
270 | private bool m_passTouches; | 270 | private bool m_passTouches; |
271 | 271 | ||
272 | private UpdateRequired m_updateFlag; | ||
273 | |||
274 | private PhysicsActor m_physActor; | 272 | private PhysicsActor m_physActor; |
275 | protected Vector3 m_acceleration; | 273 | protected Vector3 m_acceleration; |
276 | protected Vector3 m_angularVelocity; | 274 | protected Vector3 m_angularVelocity; |
@@ -1035,11 +1033,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1035 | } | 1033 | } |
1036 | } | 1034 | } |
1037 | 1035 | ||
1038 | public UpdateRequired UpdateFlag | 1036 | public UpdateRequired UpdateFlag { get; set; } |
1039 | { | ||
1040 | get { return m_updateFlag; } | ||
1041 | set { m_updateFlag = value; } | ||
1042 | } | ||
1043 | 1037 | ||
1044 | /// <summary> | 1038 | /// <summary> |
1045 | /// Used for media on a prim. | 1039 | /// Used for media on a prim. |
@@ -2999,6 +2993,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2999 | { | 2993 | { |
3000 | case UpdateRequired.TERSE: | 2994 | case UpdateRequired.TERSE: |
3001 | { | 2995 | { |
2996 | ClearUpdateSchedule(); | ||
3002 | // Throw away duplicate or insignificant updates | 2997 | // Throw away duplicate or insignificant updates |
3003 | if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || | 2998 | if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || |
3004 | !Acceleration.Equals(m_lastAcceleration) || | 2999 | !Acceleration.Equals(m_lastAcceleration) || |
@@ -3008,9 +3003,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3008 | !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || | 3003 | !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || |
3009 | Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) | 3004 | Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) |
3010 | { | 3005 | { |
3011 | |||
3012 | SendTerseUpdateToAllClients(); | 3006 | SendTerseUpdateToAllClients(); |
3013 | ClearUpdateSchedule(); | ||
3014 | 3007 | ||
3015 | // Update the "last" values | 3008 | // Update the "last" values |
3016 | m_lastPosition = OffsetPosition; | 3009 | m_lastPosition = OffsetPosition; |
@@ -3024,12 +3017,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3024 | } | 3017 | } |
3025 | case UpdateRequired.FULL: | 3018 | case UpdateRequired.FULL: |
3026 | { | 3019 | { |
3020 | ClearUpdateSchedule(); | ||
3027 | SendFullUpdateToAllClients(); | 3021 | SendFullUpdateToAllClients(); |
3028 | break; | 3022 | break; |
3029 | } | 3023 | } |
3030 | } | 3024 | } |
3031 | |||
3032 | ClearUpdateSchedule(); | ||
3033 | } | 3025 | } |
3034 | 3026 | ||
3035 | /// <summary> | 3027 | /// <summary> |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 5b28e7c..c1a3e61 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -391,11 +391,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
391 | space = d.HashSpaceCreate(IntPtr.Zero); | 391 | space = d.HashSpaceCreate(IntPtr.Zero); |
392 | 392 | ||
393 | contactgroup = d.JointGroupCreate(0); | 393 | contactgroup = d.JointGroupCreate(0); |
394 | //contactgroup | ||
395 | 394 | ||
396 | d.WorldSetAutoDisableFlag(world, false); | 395 | d.WorldSetAutoDisableFlag(world, false); |
396 | |||
397 | #if USE_DRAWSTUFF | 397 | #if USE_DRAWSTUFF |
398 | |||
399 | Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization)); | 398 | Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization)); |
400 | viewthread.Start(); | 399 | viewthread.Start(); |
401 | #endif | 400 | #endif |
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index ecf2005..a4a0cba 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
@@ -281,12 +281,6 @@ | |||
281 | <Key Name="assetType" Value="0" /> | 281 | <Key Name="assetType" Value="0" /> |
282 | <Key Name="fileName" Value="wood1.jp2" /> | 282 | <Key Name="fileName" Value="wood1.jp2" /> |
283 | </Section> | 283 | </Section> |
284 | <Section Name="LOLCAT"> | ||
285 | <Key Name="assetID" Value="13371337-1337-1337-1337-133713371337" /> | ||
286 | <Key Name="name" Value="lolcat in ur assets" /> | ||
287 | <Key Name="assetType" Value="0" /> | ||
288 | <Key Name="fileName" Value="peaches.jp2" /> | ||
289 | </Section> | ||
290 | <Section Name="bricks"> | 284 | <Section Name="bricks"> |
291 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> | 285 | <Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/> |
292 | <Key Name="name" Value="bricks"/> | 286 | <Key Name="name" Value="bricks"/> |
diff --git a/bin/assets/TexturesAssetSet/peaches.jp2 b/bin/assets/TexturesAssetSet/peaches.jp2 deleted file mode 100644 index a3ec8f0..0000000 --- a/bin/assets/TexturesAssetSet/peaches.jp2 +++ /dev/null | |||
Binary files differ | |||
diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll deleted file mode 100755 index 16a1cfc..0000000 --- a/bin/libdb_dotNET43.dll +++ /dev/null | |||
Binary files differ | |||