diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 11d3e36fe4..30f4495d15 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
///
/// Add a handler for the given packet type.
///
- /// The packet is handled on its own thread. If packets must be handled in the order in which thye
- /// are received then please us ethe synchronous version of this method.
+ ///
+ /// The packet is handled on its own thread. If packets must be handled in the order in which thye
+ /// are received then please use the synchronous version of this method.
+ ///
///
///
/// true if the handler was added. This is currently always the case.
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 2efb269f58..acf36dfb1e 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
changed = sp.Appearance.SetTextureEntries(textureEntry) || changed;
m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID);
- Util.FireAndForget(delegate(object o) { ValidateBakedTextureCache(sp, false); });
+ ValidateBakedTextureCache(sp, false);
// This appears to be set only in the final stage of the appearance
// update transaction. In theory, we should be able to do an immediate
// appearance send and save here.
-
}
+
// save only if there were changes, send no matter what (doesn't hurt to send twice)
if (changed)
QueueAppearanceSave(sp.ControllingClient.AgentId);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index cf2161abfb..67eafd58af 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1724,6 +1724,8 @@ namespace OpenSim.Region.Framework.Scenes
#endregion
+ // Send the parts of this SOG to a single client
+ // Used when the client initially connects and when client sends RequestPrim packet
public void SendFullUpdateToClient(IClientAPI remoteClient)
{
RootPart.SendFullUpdate(
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 428fe1ca04..666ce2a831 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -269,8 +269,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_passTouches;
- private UpdateRequired m_updateFlag;
-
private PhysicsActor m_physActor;
protected Vector3 m_acceleration;
protected Vector3 m_angularVelocity;
@@ -1035,11 +1033,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public UpdateRequired UpdateFlag
- {
- get { return m_updateFlag; }
- set { m_updateFlag = value; }
- }
+ public UpdateRequired UpdateFlag { get; set; }
///
/// Used for media on a prim.
@@ -2999,6 +2993,7 @@ namespace OpenSim.Region.Framework.Scenes
{
case UpdateRequired.TERSE:
{
+ ClearUpdateSchedule();
// Throw away duplicate or insignificant updates
if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
!Acceleration.Equals(m_lastAcceleration) ||
@@ -3008,9 +3003,7 @@ namespace OpenSim.Region.Framework.Scenes
!OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
{
-
SendTerseUpdateToAllClients();
- ClearUpdateSchedule();
// Update the "last" values
m_lastPosition = OffsetPosition;
@@ -3024,12 +3017,11 @@ namespace OpenSim.Region.Framework.Scenes
}
case UpdateRequired.FULL:
{
+ ClearUpdateSchedule();
SendFullUpdateToAllClients();
break;
}
}
-
- ClearUpdateSchedule();
}
///
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 5b28e7c238..c1a3e61882 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -391,11 +391,10 @@ namespace OpenSim.Region.Physics.OdePlugin
space = d.HashSpaceCreate(IntPtr.Zero);
contactgroup = d.JointGroupCreate(0);
- //contactgroup
d.WorldSetAutoDisableFlag(world, false);
+
#if USE_DRAWSTUFF
-
Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization));
viewthread.Start();
#endif
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index ecf2005c16..a4a0cba127 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -281,12 +281,6 @@
-
diff --git a/bin/assets/TexturesAssetSet/peaches.jp2 b/bin/assets/TexturesAssetSet/peaches.jp2
deleted file mode 100644
index a3ec8f04b8..0000000000
Binary files a/bin/assets/TexturesAssetSet/peaches.jp2 and /dev/null differ
diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll
deleted file mode 100755
index 16a1cfc6c2..0000000000
Binary files a/bin/libdb_dotNET43.dll and /dev/null differ