some mesh config asthetics

change flavour to rc1
Merge branch 'master' into 0.7.1-dev
2026-05-13 01:46:07 +08:00 · 2011-04-22 00:39:39 +01:00 · 2011-04-21 23:15:02 +01:00 · 2011-04-21 23:02:32 +01:00 · 2011-04-08 21:07:43 +01:00 · 2011-04-08 00:34:31 +01:00
4 changed files with 4 additions and 4 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.1";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const Flavour VERSION_FLAVOUR = Flavour.RC1;

        public enum Flavour
        {
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
            if (meshConfig == null)
                return;

-            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+            m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
        }

        public void AddRegion(Scene pScene)
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
            if (meshConfig == null)
                return;

-            m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+            m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
        }

        public void AddRegion(Scene pScene)
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -453,7 +453,7 @@
 [Mesh]
    ; enable / disable Collada mesh support
    ; default is true
-    ColladaMesh = true
+    AllowMeshUpload = true

    ; if you use Meshmerizer and want collisions for meshies, setting this to true
    ; will cause OpenSim to attempt to decode meshies assets, extract the physics
Author	SHA1	Message	Date
BlueWall	70e8e8a785	some mesh config asthetics	2011-04-22 00:39:39 +01:00
Justin Clark-Casey (justincc)	09113bb813	change flavour to rc1	2011-04-21 23:15:02 +01:00
Justin Clark-Casey (justincc)	149d4e48d8	Merge branch 'master' into 0.7.1-dev	2011-04-21 23:02:32 +01:00
Justin Clark-Casey (justincc)	7c88821020	Merge branch 'master' into 0.7.1-dev	2011-04-08 21:07:43 +01:00
Justin Clark-Casey (justincc)	557769f6e1	Merge branch 'master' into 0.7.1-dev	2011-04-08 00:34:31 +01:00
Justin Clark-Casey (justincc)	7b989e8432	Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and use this instead of the system one. This means that Mac OS X users can now use the standard sqlite adaptor instead of the legacy one. This is SQLite 3.7.5. I configured the build with the line CFLAGS="-Os -g -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc7400 -DSQLITE_ENABLE_COLUMN_METADATA" LDFLAGS="-arch i386 -arch x86_64 -arch ppc7400" ./configure --disable-dependency-tracking The SQLITE_ENABLE_COLUMN_METADATA flag exports the metadata symbols that modern Mono SQLite adaptors need. The -Os removes debugging symbols (as per the sqlite3 source pkg README) The other parts are to cross compile for x86_64, i386 and ppc. On Mac OS X, Mono can actually only P/INVOKE 32-bit libraries even on 64 bit platforms so i386 is being used. The dylib has not been tested on ppc.	2011-04-07 23:19:42 +01:00
Justin Clark-Casey (justincc)	489e1b11b7	Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X. The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.	2011-04-07 23:16:36 +01:00