Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes

Switch flavour to release
Don't start pCampbot if the user doesn't supply bot firstname, lastname stub and password
2012-02-29 22:22:42 +00:00 · 2012-02-29 22:10:33 +00:00 · 2012-02-29 22:04:17 +00:00 · 2012-02-29 22:04:04 +00:00 · 2012-02-29 22:03:28 +00:00 · 2012-02-29 22:03:15 +00:00
26 changed files with 128 additions and 120 deletions
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -30,7 +30,7 @@ namespace OpenSim
    public class VersionInfo
    {
        private const string VERSION_NUMBER = "0.7.3";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const Flavour VERSION_FLAVOUR = Flavour.Release;

        public enum Flavour
        {
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            string userAssetServer = string.Empty;
            if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
            {
-                Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); });
+                m_assMapper.Post(assetID, avatarID, userAssetServer);
            }
        }

--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Region.Framework.Scenes
                        // that the region position is cached or performance will degrade
                        Utils.LongToUInts(regionHandle, out x, out y);
                        GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
+
 //                        bool v = true;
                        if (!simulatorList.Contains(dest.ServerURI))
                        {
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7069,10 +7069,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            shapeBlock.PathScaleX = 100;
            shapeBlock.PathScaleY = 150;

-            if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER &&
-                type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE &&
-                type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE &&
-                type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS)
+            int flag = type & (ScriptBaseClass.PRIM_SCULPT_FLAG_INVERT | ScriptBaseClass.PRIM_SCULPT_FLAG_MIRROR);
+
+            if (type != (ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER | flag) &&
+                type != (ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE | flag) &&
+                type != (ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE | flag) &&
+                type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
            {
                // default
                type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -378,6 +378,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
        public const int PRIM_SCULPT_TYPE_TORUS = 2;
        public const int PRIM_SCULPT_TYPE_PLANE = 3;
        public const int PRIM_SCULPT_TYPE_CYLINDER = 4;
+        public const int PRIM_SCULPT_FLAG_INVERT = 64;
+        public const int PRIM_SCULPT_FLAG_MIRROR = 128;

        public const int MASK_BASE = 0;
        public const int MASK_OWNER = 1;
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -224,13 +224,11 @@ namespace OpenSim.Region.UserStatistics
                concurrencyCounter--;
                
                response_code = 200;
-
            }
            else
            {
                strOut = MainServer.Instance.GetHTTP404("");
            }
-            

            responsedata["int_response_code"] = response_code;
            responsedata["content_type"] = contenttype;
@@ -247,43 +245,44 @@ namespace OpenSim.Region.UserStatistics
                // TODO: FIXME: implement stats migrations
                const string SQL = @"SELECT * FROM migrations LIMIT 1";

-                SqliteCommand cmd = new SqliteCommand(SQL, db);
-
-                try
+                using (SqliteCommand cmd = new SqliteCommand(SQL, db))
                {
-                    cmd.ExecuteNonQuery();
-                }
-                catch (SqliteSyntaxException)
-                {
-                    CreateTables(db);
+                    try
+                    {
+                        cmd.ExecuteNonQuery();
+                    }
+                    catch (SqliteSyntaxException)
+                    {
+                        CreateTables(db);
+                    }
                }
            }
        }

        public void CreateTables(SqliteConnection db)
        {
-            SqliteCommand createcmd = new SqliteCommand(SQL_STATS_TABLE_CREATE, db);
-            createcmd.ExecuteNonQuery();
+            using (SqliteCommand createcmd = new SqliteCommand(SQL_STATS_TABLE_CREATE, db))
+            {
+                createcmd.ExecuteNonQuery();

-            createcmd.CommandText = SQL_MIGRA_TABLE_CREATE;
-            createcmd.ExecuteNonQuery();
+                createcmd.CommandText = SQL_MIGRA_TABLE_CREATE;
+                createcmd.ExecuteNonQuery();
+            }
        }

        public virtual void PostInitialise()
        {
            if (!enabled)
-            {
                return;
-            }
+
            AddHandlers();
        }

        public virtual void Close()
        {
            if (!enabled)
-            {
                return;
-            }
+
            dbConn.Close();
            dbConn.Dispose();
            m_sessions.Clear();
@@ -304,7 +303,8 @@ namespace OpenSim.Region.UserStatistics

        public void OnRegisterCaps(UUID agentID, Caps caps)
        {
-            m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
+//            m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
+
            string capsPath = "/CAPS/VS/" + UUID.Random();
            caps.RegisterHandler("ViewerStats",
                                 new RestStreamHandler("POST", capsPath,
@@ -318,7 +318,6 @@ namespace OpenSim.Region.UserStatistics

        public void OnDeRegisterCaps(UUID agentID, Caps caps)
        {
-            
        }

        protected virtual void AddHandlers()
@@ -368,7 +367,6 @@ namespace OpenSim.Region.UserStatistics

        public void OnMakeChildAgent(ScenePresence agent)
        {
-            
        }

        public void OnClientClosed(UUID agentID, Scene scene)
@@ -430,6 +428,7 @@ namespace OpenSim.Region.UserStatistics
                        return scene.RegionInfo.RegionID;
                }
            }
+
            return UUID.Zero;
        }

@@ -458,14 +457,14 @@ namespace OpenSim.Region.UserStatistics
            UserSessionData usd;
            OSD message = OSDParser.DeserializeLLSDXml(request);
            OSDMap mmap;
+
            lock (m_sessions)
            {
                if (agentID != UUID.Zero)
                {
-                
                    if (!m_sessions.ContainsKey(agentID))
                    {
-                        m_log.Warn("[WEB STATS MODULE]: no session for stat disclosure");
+                        m_log.WarnFormat("[WEB STATS MODULE]: no session for stat disclosure for agent {0}", agentID);
                        return new UserSessionID();
                    }
                    uid = m_sessions[agentID];
@@ -585,8 +584,6 @@ namespace OpenSim.Region.UserStatistics
                        usd.n_out_kb = (float)net_out["kbytes"].AsReal();
                        usd.n_out_pk = net_out["packets"].AsInteger();
                    }
-
-
                }
            }

@@ -602,83 +599,85 @@ namespace OpenSim.Region.UserStatistics

            lock (db)
            {
-                SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_UPDATE, db);
-                updatecmd.Parameters.Add(new SqliteParameter(":session_id", uid.session_data.session_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":agent_id", uid.session_data.agent_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":region_id", uid.session_data.region_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":last_updated", (int) uid.session_data.last_updated));
-                updatecmd.Parameters.Add(new SqliteParameter(":remote_ip", uid.session_data.remote_ip));
-                updatecmd.Parameters.Add(new SqliteParameter(":name_f", uid.session_data.name_f));
-                updatecmd.Parameters.Add(new SqliteParameter(":name_l", uid.session_data.name_l));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_agents_in_view", uid.session_data.avg_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_agents_in_view",
-                                                             (int) uid.session_data.min_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_agents_in_view",
-                                                             (int) uid.session_data.max_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_agents_in_view",
-                                                             (int) uid.session_data.mode_agents_in_view));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_fps", uid.session_data.avg_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_fps", uid.session_data.min_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_fps", uid.session_data.max_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_fps", uid.session_data.mode_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":a_language", uid.session_data.a_language));
-                updatecmd.Parameters.Add(new SqliteParameter(":mem_use", uid.session_data.mem_use));
-                updatecmd.Parameters.Add(new SqliteParameter(":meters_traveled", uid.session_data.meters_traveled));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_ping", uid.session_data.avg_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_ping", uid.session_data.min_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_ping", uid.session_data.max_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_ping", uid.session_data.mode_ping));
-                updatecmd.Parameters.Add(new SqliteParameter(":regions_visited", uid.session_data.regions_visited));
-                updatecmd.Parameters.Add(new SqliteParameter(":run_time", uid.session_data.run_time));
-                updatecmd.Parameters.Add(new SqliteParameter(":avg_sim_fps", uid.session_data.avg_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":min_sim_fps", uid.session_data.min_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":max_sim_fps", uid.session_data.max_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":mode_sim_fps", uid.session_data.mode_sim_fps));
-                updatecmd.Parameters.Add(new SqliteParameter(":start_time", uid.session_data.start_time));
-                updatecmd.Parameters.Add(new SqliteParameter(":client_version", uid.session_data.client_version));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_cpu", uid.session_data.s_cpu));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_gpu", uid.session_data.s_gpu));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_os", uid.session_data.s_os));
-                updatecmd.Parameters.Add(new SqliteParameter(":s_ram", uid.session_data.s_ram));
-                updatecmd.Parameters.Add(new SqliteParameter(":d_object_kb", uid.session_data.d_object_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":d_texture_kb", uid.session_data.d_texture_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":d_world_kb", uid.session_data.d_world_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_in_kb", uid.session_data.n_in_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_in_pk", uid.session_data.n_in_pk));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_out_kb", uid.session_data.n_out_kb));
-                updatecmd.Parameters.Add(new SqliteParameter(":n_out_pk", uid.session_data.n_out_pk));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_dropped", uid.session_data.f_dropped));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_invalid", uid.session_data.f_invalid));
-
-                updatecmd.Parameters.Add(new SqliteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_resent", uid.session_data.f_resent));
-                updatecmd.Parameters.Add(new SqliteParameter(":f_send_packet", uid.session_data.f_send_packet));
-
-                updatecmd.Parameters.Add(new SqliteParameter(":session_key", uid.session_data.session_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":agent_key", uid.session_data.agent_id.ToString()));
-                updatecmd.Parameters.Add(new SqliteParameter(":region_key", uid.session_data.region_id.ToString()));
-//                m_log.Debug("UPDATE");
-
-                int result = updatecmd.ExecuteNonQuery();
-
-                if (result == 0)
+                using (SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_UPDATE, db))
                {
-//                    m_log.Debug("INSERT");
-                    updatecmd.CommandText = SQL_STATS_TABLE_INSERT;
-                    try
-                    {
-                        updatecmd.ExecuteNonQuery();
-                    }
-                    catch (SqliteExecutionException)
-                    {
-                        m_log.Warn("[WEB STATS MODULE]: failed to write stats to storage Execution Exception");
-                    }
-                    catch (SqliteSyntaxException)
-                    {
-                        m_log.Warn("[WEB STATS MODULE]: failed to write stats to storage SQL Syntax Exception");
-                    }
+                    updatecmd.Parameters.Add(new SqliteParameter(":session_id", uid.session_data.session_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":agent_id", uid.session_data.agent_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":region_id", uid.session_data.region_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":last_updated", (int) uid.session_data.last_updated));
+                    updatecmd.Parameters.Add(new SqliteParameter(":remote_ip", uid.session_data.remote_ip));
+                    updatecmd.Parameters.Add(new SqliteParameter(":name_f", uid.session_data.name_f));
+                    updatecmd.Parameters.Add(new SqliteParameter(":name_l", uid.session_data.name_l));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_agents_in_view", uid.session_data.avg_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_agents_in_view",
+                                                                 (int) uid.session_data.min_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_agents_in_view",
+                                                                 (int) uid.session_data.max_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_agents_in_view",
+                                                                 (int) uid.session_data.mode_agents_in_view));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_fps", uid.session_data.avg_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_fps", uid.session_data.min_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_fps", uid.session_data.max_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_fps", uid.session_data.mode_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":a_language", uid.session_data.a_language));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mem_use", uid.session_data.mem_use));
+                    updatecmd.Parameters.Add(new SqliteParameter(":meters_traveled", uid.session_data.meters_traveled));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_ping", uid.session_data.avg_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_ping", uid.session_data.min_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_ping", uid.session_data.max_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_ping", uid.session_data.mode_ping));
+                    updatecmd.Parameters.Add(new SqliteParameter(":regions_visited", uid.session_data.regions_visited));
+                    updatecmd.Parameters.Add(new SqliteParameter(":run_time", uid.session_data.run_time));
+                    updatecmd.Parameters.Add(new SqliteParameter(":avg_sim_fps", uid.session_data.avg_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":min_sim_fps", uid.session_data.min_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":max_sim_fps", uid.session_data.max_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":mode_sim_fps", uid.session_data.mode_sim_fps));
+                    updatecmd.Parameters.Add(new SqliteParameter(":start_time", uid.session_data.start_time));
+                    updatecmd.Parameters.Add(new SqliteParameter(":client_version", uid.session_data.client_version));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_cpu", uid.session_data.s_cpu));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_gpu", uid.session_data.s_gpu));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_os", uid.session_data.s_os));
+                    updatecmd.Parameters.Add(new SqliteParameter(":s_ram", uid.session_data.s_ram));
+                    updatecmd.Parameters.Add(new SqliteParameter(":d_object_kb", uid.session_data.d_object_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":d_texture_kb", uid.session_data.d_texture_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":d_world_kb", uid.session_data.d_world_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_in_kb", uid.session_data.n_in_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_in_pk", uid.session_data.n_in_pk));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_out_kb", uid.session_data.n_out_kb));
+                    updatecmd.Parameters.Add(new SqliteParameter(":n_out_pk", uid.session_data.n_out_pk));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_dropped", uid.session_data.f_dropped));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_invalid", uid.session_data.f_invalid));
+    
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_resent", uid.session_data.f_resent));
+                    updatecmd.Parameters.Add(new SqliteParameter(":f_send_packet", uid.session_data.f_send_packet));
+    
+                    updatecmd.Parameters.Add(new SqliteParameter(":session_key", uid.session_data.session_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":agent_key", uid.session_data.agent_id.ToString()));
+                    updatecmd.Parameters.Add(new SqliteParameter(":region_key", uid.session_data.region_id.ToString()));

+//                    m_log.DebugFormat("[WEB STATS MODULE]: Database stats update for {0}", uid.session_data.agent_id);
+
+                    int result = updatecmd.ExecuteNonQuery();
+
+                    if (result == 0)
+                    {
+//                        m_log.DebugFormat("[WEB STATS MODULE]: Database stats insert for {0}", uid.session_data.agent_id);
+
+                        updatecmd.CommandText = SQL_STATS_TABLE_INSERT;
+
+                        try
+                        {
+                            updatecmd.ExecuteNonQuery();
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.WarnFormat(
+                                "[WEB STATS MODULE]: failed to write stats for {0}, storage Execution Exception {1}{2}",
+                                uid.session_data.agent_id, e.Message, e.StackTrace);
+                        }
+                    }
                }
            }
        }
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -56,6 +56,10 @@ namespace pCampBot
            {
                Help();
            }
+            else if (config.Get("firstname") == null ||  config.Get("lastname") == null || config.Get("password") == null)
+            {
+                Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots.");
+            }
            else
            {
                int botcount = config.GetInt("botcount", 1);
--- a/bin/BulletDotNET.dll
+++ b/bin/BulletDotNET.dll
--- a/bin/BulletDotNET.pdb
+++ b/bin/BulletDotNET.pdb
--- a/bin/Modified.XnaDevRu.BulletX.dll
+++ b/bin/Modified.XnaDevRu.BulletX.dll
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,5 +1,5 @@
 <configuration>
-  <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" />
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" />
-  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" />
+  <dllmap os="osx" dll="sqlite3" target="lib64/libsqlite3.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
+  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="lib32/libsqlite3_32.so" />
 </configuration>
--- a/bin/Ode.NET.dll.config
+++ b/bin/Ode.NET.dll.config
@@ -1,7 +1,7 @@
 <configuration>
-  <dllmap os="osx" dll="ode" target="libode.dylib" />
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" />
-  <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" />
-  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" />
-  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" />
-</configuration>
+  <dllmap os="osx" dll="ode" target="lib64/libode.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" />
+  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" />
+  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" />
+</configuration>
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,7 +1,7 @@
 <configuration>
-    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
-    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
-    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
+    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
 </configuration>
--- a/bin/lib32/libode.so
+++ b/bin/lib32/libode.so
--- a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
+++ b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
--- a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
+++ b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
--- a/bin/lib32/libsqlite3.txt
+++ b/bin/lib32/libsqlite3.txt
--- a/bin/lib32/libsqlite3_32.so
+++ b/bin/lib32/libsqlite3_32.so
--- a/bin/lib64/libode-x86_64.so
+++ b/bin/lib64/libode-x86_64.so
--- a/bin/lib64/libode.dylib
+++ b/bin/lib64/libode.dylib
--- a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
+++ b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
--- a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
+++ b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
--- a/bin/lib64/libsqlite3.dylib
+++ b/bin/lib64/libsqlite3.dylib
--- a/bin/lib64/libsqlite3_64.so
+++ b/bin/lib64/libsqlite3_64.so
--- a/bin/libbulletnet.dll
+++ b/bin/libbulletnet.dll
--- a/bin/libbulletnet.so
+++ b/bin/libbulletnet.so
Author	SHA1	Message	Date
Justin Clark-Casey (justincc)	20bad0aa6c	Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes	2012-02-29 22:22:42 +00:00
Justin Clark-Casey (justincc)	e7f23a6218	Switch flavour to release	2012-02-29 22:10:33 +00:00
Justin Clark-Casey (justincc)	25c29db8b6	Don't start pCampbot if the user doesn't supply bot firstname, lastname stub and password	2012-02-29 22:04:17 +00:00
Justin Clark-Casey (justincc)	1750fba9ce	Call Dispose() via using() on SqliteCommands in WebStatsModule after use.	2012-02-29 22:04:04 +00:00
PixelTomsen	b18e410586	PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented http://opensimulator.org/mantis/view.php?id=5763	2012-02-29 22:03:28 +00:00
Justin Clark-Casey (justincc)	38d5e1fab3	Move libopenjpeg native libraries into lib32 and lib64 as appropriate.	2012-02-29 22:03:15 +00:00
Justin Clark-Casey (justincc)	4180c32eb1	Remove some more unused Bullet libraries.	2012-02-29 22:03:08 +00:00
Justin Clark-Casey (justincc)	5115229fdf	Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin.	2012-02-29 22:02:59 +00:00
Justin Clark-Casey (justincc)	e8f2d814e7	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.	2012-02-29 22:02:50 +00:00
Diva Canto	1fda8c5a86	HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.	2012-02-26 14:30:58 -08:00
Justin Clark-Casey (justincc)	6b77b55d40	Merge branch 'master' into 0.7.3-post-fixes	2012-02-25 00:49:16 +00:00
Justin Clark-Casey (justincc)	82cdb08c1f	Merge branch 'master' into 0.7.3-post-fixes	2012-02-25 00:49:05 +00:00
Justin Clark-Casey (justincc)	dafcb3bcd7	Merge branch 'master' into 0.7.3-post-fixes	2012-02-24 23:35:59 +00:00
Diva Canto	3259b1d1e0	Amend to last commit: synchronize access to queues.	2012-02-20 11:13:02 -08:00
Diva Canto	512910a51f	More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.	2012-02-20 11:00:01 -08:00
Diva Canto	fdda57cf10	Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.3-post-fixes	2012-02-19 16:48:09 -08:00
Diva Canto	ec8e34950d	One more tweak related to the previous 2 commits.	2012-02-19 16:47:04 -08:00
Diva Canto	93964ef3a4	Amend to last commit. This should have been committed too.	2012-02-19 16:46:47 -08:00
Diva Canto	5c8af6a136	A few more tweaks on position updates and create child agents. Mono hates concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.	2012-02-19 16:46:32 -08:00
PixelTomsen	4d0c8aca05	Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893 Signed-off-by: nebadon <michael@osgrid.org>	2012-02-19 13:49:51 -05:00
PixelTomsen	8fc16ece96	Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.php?id=5887 Signed-off-by: nebadon <michael@osgrid.org>	2012-02-19 13:49:41 -05:00
BlueWall	fcbb375e8f	Use localy defined name, TPFlags, for Constants.TeleportFlags	2012-02-19 12:42:05 -05:00
BlueWall	49c65279fa	Route logins according to Estate, Telehub and TeleportFlags	2012-02-19 12:41:44 -05:00
BlueWall	86e8a56fe1	Propagate our teleport flags on logins	2012-02-19 12:41:30 -05:00
BlueWall	b199330682	Parcel sales support to SQLite	2012-02-19 12:41:11 -05:00
BlueWall	7a7ebaebd1	Fillin missing SQLite support for Telehubs	2012-02-19 12:40:46 -05:00
BlueWall	164ae0b24b	Fix missing telehub handling on login	2012-02-19 12:40:26 -05:00
Diva Canto	7156545fca	This should smooth movement in heteregeneous networks by a lot: cache the region by position instead of looking it up all the time -- this was being done during the main update loop!	2012-02-18 22:15:58 -08:00
Justin Clark-Casey (justincc)	73a5abf4d9	Merge branch 'master' into 0.7.3-post-fixes	2012-02-17 04:04:38 +00:00
Justin Clark-Casey (justincc)	630c8dc828	switch version flavour to rc2	2012-02-17 04:03:59 +00:00
Justin Clark-Casey (justincc)	6de89246c2	Merge branch 'master' into 0.7.3-post-fixes	2012-02-17 00:02:16 +00:00
Justin Clark-Casey (justincc)	96973a5778	Merge branch 'master' into 0.7.3-post-fixes	2012-02-16 03:39:25 +00:00
Justin Clark-Casey (justincc)	96843f2b17	Merge branch 'master' into 0.7.3-post-fixes	2012-02-15 02:41:50 +00:00
Justin Clark-Casey (justincc)	8a36f54cf4	Merge branch 'master' into 0.7.3-post-fixes	2012-02-06 20:54:21 +00:00
Justin Clark-Casey (justincc)	1a14e660d2	Merge branch 'master' into 0.7.3-post-fixes	2012-02-04 02:03:49 +00:00
Justin Clark-Casey (justincc)	2502aae5db	Switch flavour to RC1. It will still be a while before RC1 is released.	2012-02-04 01:26:29 +00:00