5 files changed, 13 insertions, 45 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a9f9d60..4ab719d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3485,6 +3485,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
+            if (entity is SceneObjectPart)
+            {
+                SceneObjectPart e = (SceneObjectPart)entity;
+                SceneObjectGroup g = e.ParentGroup;
+                if (g.RootPart.Shape.State > 30) // HUD
+                    if (g.OwnerID != AgentId)
+                        return; // Don't send updates for other people's HUDs
+            }
+
             double priority = m_prioritizer.GetUpdatePriority(this, entity);
 
             lock (m_entityUpdates.SyncRoot)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 0d04491..98545f9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
-            m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog);
+            //m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog);
             
             Scene scene = FindClientScene(client.AgentId);
 
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 1604c4b..2105be1 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -1332,10 +1332,10 @@ namespace OpenSim.Region.Physics.OdePlugin
             _parent_scene.waitForSpaceUnlock(m_targetSpace);
             try
             {
-                if (prim_geom == IntPtr.Zero)
-                {
+            //    if (prim_geom == IntPtr.Zero)  // setGeom takes care of phys engine recreate and prim_geom pointer 
+            //    {
                     SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
-                }
+            //    }
             }
             catch (AccessViolationException)
             {
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
deleted file mode 100644
index 1d4dd29..0000000
--- a/bin/config-include/storage/SQLiteLegacyStandalone.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-; These are the initialization settings for running OpenSim Standalone with an SQLite database
-
-[DatabaseService]
-    StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
-
-[AvatarService]
-    ConnectionString = "URI=file:avatars.db,version=3"
-
-[AuthenticationService]
-    ConnectionString = "URI=file:auth.db,version=3"
-
-[UserAccountService]
-    ConnectionString = "URI=file:userprofiles.db,version=3"
-
-[FriendsService]
-    ConnectionString = "URI=file:friends.db,version=3"
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
deleted file mode 100644
index fe814d7..0000000
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-; These are the initialization settings for running OpenSim Standalone with an SQLite database
-
-[DatabaseService]
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-
-[InventoryService]
-    ;ConnectionString = "URI=file:inventory.db,version=3"
-    ; if you have a legacy inventory store use the connection string below
-    ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
-
-[AvatarService]
-    ConnectionString = "URI=file:avatars.db,version=3"
-
-[AuthenticationService]
-    ConnectionString = "URI=file:auth.db,version=3"
-
-[UserAccountService]
-    ConnectionString = "URI=file:userprofiles.db,version=3"
-
-[GridUserService]
-    ConnectionString = "URI=file:griduser.db,version=3"
-
-[FriendsService]
-    ConnectionString = "URI=file:friends.db,version=3"
-