HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.

PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
http://opensimulator.org/mantis/view.php?id=5763
2012-02-25 21:00:19 -08:00 · 2012-02-25 15:33:33 +00:00 · 2012-02-25 04:26:32 +00:00 · 2012-02-25 04:22:59 +00:00 · 2012-02-25 03:36:43 +00:00 · 2012-02-25 03:25:56 +00:00
25 changed files with 23 additions and 19 deletions
--- 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/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/bin/BulletDotNET.dll
+++ b/bin/BulletDotNET.dll
--- a/bin/BulletDotNET.pdb
+++ b/bin/BulletDotNET.pdb
--- a/bin/Fadd.Globalization.Yaml.dll
+++ b/bin/Fadd.Globalization.Yaml.dll
--- a/bin/Fadd.dll
+++ b/bin/Fadd.dll
--- 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
--- a/bin/xunit.dll
+++ b/bin/xunit.dll
Author	SHA1	Message	Date
Diva Canto	142f8a4aec	HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.	2012-02-25 21:00:19 -08:00
PixelTomsen	01f454242d	PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented http://opensimulator.org/mantis/view.php?id=5763	2012-02-25 15:33:33 +00:00
Justin Clark-Casey (justincc)	4a5f9fe6a2	Move libopenjpeg native libraries into lib32 and lib64 as appropriate.	2012-02-25 04:26:32 +00:00
Justin Clark-Casey (justincc)	6159110258	Remove some more unused Bullet libraries.	2012-02-25 04:22:59 +00:00
Justin Clark-Casey (justincc)	ca19b9078f	Remove old libbulletnet native libraries. These are not used in the current generation bullet physics plugin.	2012-02-25 03:36:43 +00:00
Justin Clark-Casey (justincc)	6138662716	Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as appropriate.	2012-02-25 03:25:56 +00:00
Justin Clark-Casey (justincc)	3fbcd21916	Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like these were once connected with HttpServer.dll but are now unused.	2012-02-25 03:12:41 +00:00