From 27506175f1bbdb7fab39ca04a32dce192bccc278 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 01:53:57 +0100 Subject: adjust freeswitch grid connector to port 8003 to agree with the default 8003 used in OpenSim.ini.example Adjusting to 8003 seems sensible since this service doesn't need to be exposed to viewers. --- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index e2e9624..daeb068 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -21,7 +21,7 @@ ; * [[@]/][:] ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8003/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 4d16236..9c391ea 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -13,7 +13,7 @@ ; * [[@]/][:] ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8003/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above -- cgit v1.1 From b0bcf0cc99e77b584f19dbc471e21c4e7890fcb8 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 02:05:16 +0100 Subject: Change default ini.example port used by Freeswitch in grid settings to 8004. This is to facilitate running Freeswitch in a separate ROBUST shell, as on grid setups there can be quite a lot of traffic flowing between FreeSWITCH and ROBUST. However, running in a spearate shell is not mandatory. --- bin/OpenSim.ini.example | 2 +- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index fbaa590..5389b44 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -626,7 +626,7 @@ ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector ;; If using a remote connector, specify the server URL - ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi + ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi [FreeswitchService] diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index daeb068..f2f2a66 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -21,7 +21,7 @@ ; * [[@]/][:] ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8003/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 9c391ea..aef0596 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -13,7 +13,7 @@ ; * [[@]/][:] ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8003/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector" ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above -- cgit v1.1 From 3698e431dc08df080f112d52b85dbfcb51bcae91 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 02:25:49 +0100 Subject: Bump minimum required mono to 2.4.3 from 2.4.2. OpenSim fails at runtime below 2.4.3 due to unimplemented ServicePointManager.get_ServerCertificateValidationCallback() --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 391a659..72702a2 100644 --- a/README.txt +++ b/README.txt @@ -37,7 +37,7 @@ Now see the "Configuring OpenSim" section === Running OpenSim on Linux === ================================ -You will need Mono >= 2.4.2 to run OpenSim. On some Linux distributions you +You will need Mono >= 2.4.3 to run OpenSim. On some Linux distributions you may need to install additional packages. See http://opensimulator.org/wiki/Dependencies for more information. -- cgit v1.1 From e09f19674e52af20ce03ba8292adbf6518fc204a Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 23:57:26 +0100 Subject: add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows Mono doesn't care if the --- bin/Axiom.MathLib.dll | Bin bin/BulletDotNET.dll | Bin bin/C5.dll | Bin bin/CSJ2K.dll | Bin bin/Community.CsharpSqlite.Sqlite.dll | Bin bin/Community.CsharpSqlite.dll | Bin bin/CookComputing.XmlRpcV2.dll | Bin bin/DotNetOpenId.dll | Bin bin/DotNetOpenMail.dll | Bin bin/Fadd.Globalization.Yaml.dll | Bin bin/Fadd.dll | Bin bin/GlynnTucker.Cache.dll | Bin bin/Google.ProtocolBuffers.dll | Bin bin/HttpServer.dll | Bin bin/HttpServer_OpenSim.dll | Bin bin/Iesi.Collections.dll | Bin bin/Kds.Serialization.dll | Bin bin/Modified.XnaDevRu.BulletX.dll | Bin bin/Mono.Addins.CecilReflector.dll | Bin bin/Mono.Addins.Setup.dll | Bin bin/Mono.Addins.dll | Bin bin/Mono.Data.Sqlite.dll | Bin bin/Mono.Data.SqliteClient.dll | Bin bin/MonoXnaCompactMaths.dll | Bin bin/MySql.Data.dll | Bin bin/NDesk.Options.dll | Bin bin/Newtonsoft.Json.Net20.dll | Bin bin/Nini.dll | Bin bin/Npgsql.dll | Bin bin/Ode.NET.dll | Bin bin/OpenMetaverse.StructuredData.dll | Bin bin/OpenMetaverse.dll | Bin bin/OpenMetaverseTypes.dll | Bin bin/PhysX-wrapper.dll | Bin bin/PhysX_Wrapper_Dotnet.dll | Bin bin/PrimMesher.dll | Bin bin/PumaCode.SvnDotNet.dll | Bin bin/Tools.dll | Bin bin/Warp3D.dll | Bin bin/XMLRPC.dll | Bin bin/libbulletnet.dll | Bin bin/libdb_dotNET43.dll | Bin bin/log4net.dll | Bin bin/nunit.framework.dll | Bin bin/ode.dll | Bin bin/openjpeg-dotnet-x86_64.dll | Bin bin/openjpeg-dotnet.dll | Bin bin/xunit.dll | Bin bin/zlib.net.dll | Bin 49 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/Axiom.MathLib.dll mode change 100644 => 100755 bin/BulletDotNET.dll mode change 100644 => 100755 bin/C5.dll mode change 100644 => 100755 bin/CSJ2K.dll mode change 100644 => 100755 bin/Community.CsharpSqlite.Sqlite.dll mode change 100644 => 100755 bin/Community.CsharpSqlite.dll mode change 100644 => 100755 bin/CookComputing.XmlRpcV2.dll mode change 100644 => 100755 bin/DotNetOpenId.dll mode change 100644 => 100755 bin/DotNetOpenMail.dll mode change 100644 => 100755 bin/Fadd.Globalization.Yaml.dll mode change 100644 => 100755 bin/Fadd.dll mode change 100644 => 100755 bin/GlynnTucker.Cache.dll mode change 100644 => 100755 bin/Google.ProtocolBuffers.dll mode change 100644 => 100755 bin/HttpServer.dll mode change 100644 => 100755 bin/HttpServer_OpenSim.dll mode change 100644 => 100755 bin/Iesi.Collections.dll mode change 100644 => 100755 bin/Kds.Serialization.dll mode change 100644 => 100755 bin/Modified.XnaDevRu.BulletX.dll mode change 100644 => 100755 bin/Mono.Addins.CecilReflector.dll mode change 100644 => 100755 bin/Mono.Addins.Setup.dll mode change 100644 => 100755 bin/Mono.Addins.dll mode change 100644 => 100755 bin/Mono.Data.Sqlite.dll mode change 100644 => 100755 bin/Mono.Data.SqliteClient.dll mode change 100644 => 100755 bin/MonoXnaCompactMaths.dll mode change 100644 => 100755 bin/MySql.Data.dll mode change 100644 => 100755 bin/NDesk.Options.dll mode change 100644 => 100755 bin/Newtonsoft.Json.Net20.dll mode change 100644 => 100755 bin/Nini.dll mode change 100644 => 100755 bin/Npgsql.dll mode change 100644 => 100755 bin/Ode.NET.dll mode change 100644 => 100755 bin/OpenMetaverse.StructuredData.dll mode change 100644 => 100755 bin/OpenMetaverse.dll mode change 100644 => 100755 bin/OpenMetaverseTypes.dll mode change 100644 => 100755 bin/PhysX-wrapper.dll mode change 100644 => 100755 bin/PhysX_Wrapper_Dotnet.dll mode change 100644 => 100755 bin/PrimMesher.dll mode change 100644 => 100755 bin/PumaCode.SvnDotNet.dll mode change 100644 => 100755 bin/Tools.dll mode change 100644 => 100755 bin/Warp3D.dll mode change 100644 => 100755 bin/XMLRPC.dll mode change 100644 => 100755 bin/libbulletnet.dll mode change 100644 => 100755 bin/libdb_dotNET43.dll mode change 100644 => 100755 bin/log4net.dll mode change 100644 => 100755 bin/nunit.framework.dll mode change 100644 => 100755 bin/ode.dll mode change 100644 => 100755 bin/openjpeg-dotnet-x86_64.dll mode change 100644 => 100755 bin/openjpeg-dotnet.dll mode change 100644 => 100755 bin/xunit.dll mode change 100644 => 100755 bin/zlib.net.dll diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll old mode 100644 new mode 100755 diff --git a/bin/BulletDotNET.dll b/bin/BulletDotNET.dll old mode 100644 new mode 100755 diff --git a/bin/C5.dll b/bin/C5.dll old mode 100644 new mode 100755 diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll old mode 100644 new mode 100755 diff --git a/bin/Community.CsharpSqlite.Sqlite.dll b/bin/Community.CsharpSqlite.Sqlite.dll old mode 100644 new mode 100755 diff --git a/bin/Community.CsharpSqlite.dll b/bin/Community.CsharpSqlite.dll old mode 100644 new mode 100755 diff --git a/bin/CookComputing.XmlRpcV2.dll b/bin/CookComputing.XmlRpcV2.dll old mode 100644 new mode 100755 diff --git a/bin/DotNetOpenId.dll b/bin/DotNetOpenId.dll old mode 100644 new mode 100755 diff --git a/bin/DotNetOpenMail.dll b/bin/DotNetOpenMail.dll old mode 100644 new mode 100755 diff --git a/bin/Fadd.Globalization.Yaml.dll b/bin/Fadd.Globalization.Yaml.dll old mode 100644 new mode 100755 diff --git a/bin/Fadd.dll b/bin/Fadd.dll old mode 100644 new mode 100755 diff --git a/bin/GlynnTucker.Cache.dll b/bin/GlynnTucker.Cache.dll old mode 100644 new mode 100755 diff --git a/bin/Google.ProtocolBuffers.dll b/bin/Google.ProtocolBuffers.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll old mode 100644 new mode 100755 diff --git a/bin/Iesi.Collections.dll b/bin/Iesi.Collections.dll old mode 100644 new mode 100755 diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll old mode 100644 new mode 100755 diff --git a/bin/Modified.XnaDevRu.BulletX.dll b/bin/Modified.XnaDevRu.BulletX.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Data.Sqlite.dll b/bin/Mono.Data.Sqlite.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Data.SqliteClient.dll b/bin/Mono.Data.SqliteClient.dll old mode 100644 new mode 100755 diff --git a/bin/MonoXnaCompactMaths.dll b/bin/MonoXnaCompactMaths.dll old mode 100644 new mode 100755 diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll old mode 100644 new mode 100755 diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll old mode 100644 new mode 100755 diff --git a/bin/Newtonsoft.Json.Net20.dll b/bin/Newtonsoft.Json.Net20.dll old mode 100644 new mode 100755 diff --git a/bin/Nini.dll b/bin/Nini.dll old mode 100644 new mode 100755 diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll old mode 100644 new mode 100755 diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll old mode 100644 new mode 100755 diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll old mode 100644 new mode 100755 diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll old mode 100644 new mode 100755 diff --git a/bin/PrimMesher.dll b/bin/PrimMesher.dll old mode 100644 new mode 100755 diff --git a/bin/PumaCode.SvnDotNet.dll b/bin/PumaCode.SvnDotNet.dll old mode 100644 new mode 100755 diff --git a/bin/Tools.dll b/bin/Tools.dll old mode 100644 new mode 100755 diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll old mode 100644 new mode 100755 diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll old mode 100644 new mode 100755 diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll old mode 100644 new mode 100755 diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll old mode 100644 new mode 100755 diff --git a/bin/log4net.dll b/bin/log4net.dll old mode 100644 new mode 100755 diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll old mode 100644 new mode 100755 diff --git a/bin/ode.dll b/bin/ode.dll old mode 100644 new mode 100755 diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll old mode 100644 new mode 100755 diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll old mode 100644 new mode 100755 diff --git a/bin/xunit.dll b/bin/xunit.dll old mode 100644 new mode 100755 diff --git a/bin/zlib.net.dll b/bin/zlib.net.dll old mode 100644 new mode 100755 -- cgit v1.1 From 8f3d2f5f5eb172923328f554821c34560dac4f3b Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 28 Apr 2011 00:59:21 +0100 Subject: Fix a bug where physical objects rezzed with an initial velocity by script do not receive this velocity. This is a minimal fix for the 0.7.1 release, pending a non copy/paste solution. This hopefully addresses http://opensimulator.org/mantis/view.php?id=5457 The bug was introduced in commit 3ba5eeb --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 0f85925..0b2b01a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -2039,6 +2039,12 @@ namespace OpenSim.Region.Framework.Scenes if (rot != null) group.UpdateGroupRotationR((Quaternion)rot); + // TODO: This needs to be refactored with the similar code in + // SceneGraph.AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) + // possibly by allowing this method to take a null rotation. + if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) + group.RootPart.ApplyImpulse((vel * group.GetMass()), false); + // We can only call this after adding the scene object, since the scene object references the scene // to find out if scripts should be activated at all. group.CreateScriptInstances(param, true, DefaultScriptEngine, 3); -- cgit v1.1 From 69fb1faa030ad199430a34f71ce18bc4b12f5c16 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 28 Apr 2011 22:59:12 +0100 Subject: Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim. Addresses http://opensimulator.org/mantis/view.php?id=5444 Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct. This did not effect scripts. --- .../Agent/AssetTransaction/AgentAssetsTransactions.cs | 9 +++++---- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 ++++ OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 7 +++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 771038e..9d8082b 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -41,8 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction /// public class AgentAssetTransactions { -// private static readonly ILog m_log = LogManager.GetLogger( -// MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // Fields private bool m_dumpAssetsToFile; @@ -149,6 +148,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction if (asset != null) { +// m_log.DebugFormat( +// "[AGENT ASSETS TRANSACTIONS]: Updating item {0} in {1} for transaction {2}", +// item.Name, part.Name, transactionID); + asset.FullID = UUID.Random(); asset.Name = item.Name; asset.Description = item.Description; @@ -156,8 +159,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction item.AssetID = asset.FullID; m_Scene.AssetService.Store(asset); - - part.Inventory.UpdateInventoryItem(item); } } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 0b2b01a..b0f0de6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1430,6 +1430,10 @@ namespace OpenSim.Region.Framework.Scenes } else // Updating existing item with new perms etc { +// m_log.DebugFormat( +// "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", +// currentItem.Name, part.Name); + IAgentAssetTransactions agentTransactions = this.RequestModuleInterface(); if (agentTransactions != null) { diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 3281eab..3b60f8c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -693,8 +693,9 @@ namespace OpenSim.Region.Framework.Scenes { TaskInventoryItem it = GetInventoryItem(item.ItemID); if (it != null) - { +// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name); + item.ParentID = m_part.UUID; item.ParentPartID = m_part.UUID; @@ -711,14 +712,16 @@ namespace OpenSim.Region.Framework.Scenes m_items[item.ItemID] = item; m_inventorySerial++; } - + if (fireScriptEvents) m_part.TriggerScriptChangedEvent(Changed.INVENTORY); + if (considerChanged) { HasInventoryChanged = true; m_part.ParentGroup.HasGroupChanged = true; } + return true; } else -- cgit v1.1 From 975cebea0b639a235ce1b13d6de66abef04d6df8 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Apr 2011 07:28:29 -0700 Subject: Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to speed with 0.7.x. --- OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs | 6 +- OpenSim/Data/MSSQL/MSSQLMigration.cs | 3 +- OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 25 +++-- OpenSim/Data/MSSQL/Resources/AuthStore.migrations | 8 +- OpenSim/Data/MSSQL/Resources/Avatar.migrations | 25 ++++- .../Data/MSSQL/Resources/FriendsStore.migrations | 4 +- OpenSim/Data/MSSQL/Resources/GridStore.migrations | 13 +++ .../Data/MSSQL/Resources/InventoryStore.migrations | 9 +- OpenSim/Data/MSSQL/Resources/Presence.migrations | 17 +-- .../Data/MSSQL/Resources/RegionStore.migrations | 119 ++++++++++++++++++++- .../Data/MSSQL/Resources/UserAccount.migrations | 2 +- 11 files changed, 199 insertions(+), 32 deletions(-) diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs index 6a5d6eb..f5492b3 100644 --- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs +++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs @@ -56,15 +56,15 @@ namespace OpenSim.Data.MSSQL string realm, string storeName) { m_Realm = realm; + + m_ConnectionString = connectionString; if (storeName != String.Empty) { - Assembly assem = GetType().Assembly; - m_ConnectionString = connectionString; using (SqlConnection conn = new SqlConnection(m_ConnectionString)) { conn.Open(); - Migration m = new Migration(conn, assem, storeName); + Migration m = new Migration(conn, GetType().Assembly, storeName); m.Update(); } diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs index aea31c9..cd395b8 100644 --- a/OpenSim/Data/MSSQL/MSSQLMigration.cs +++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs @@ -61,7 +61,8 @@ namespace OpenSim.Data.MSSQL } catch { - // Something went wrong, so we're version 0 + // Return -1 to indicate table does not exist + return -1; } } return version; diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index 80ec65e..5155e56 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs @@ -492,12 +492,11 @@ ELSE using (SqlConnection conn = new SqlConnection(m_connectionString)) using (SqlCommand cmd = new SqlCommand(sql, conn)) { + conn.Open(); foreach (TaskInventoryItem taskItem in items) { cmd.Parameters.AddRange(CreatePrimInventoryParameters(taskItem)); - conn.Open(); cmd.ExecuteNonQuery(); - cmd.Parameters.Clear(); } } @@ -1154,9 +1153,9 @@ VALUES PrimitiveBaseShape baseShape = new PrimitiveBaseShape(); baseShape.Scale = new Vector3( - Convert.ToSingle(shapeRow["ScaleX"]), - Convert.ToSingle(shapeRow["ScaleY"]), - Convert.ToSingle(shapeRow["ScaleZ"])); + (float)Convert.ToDouble(shapeRow["ScaleX"]), + (float)Convert.ToDouble(shapeRow["ScaleY"]), + (float)Convert.ToDouble(shapeRow["ScaleZ"])); // paths baseShape.PCode = Convert.ToByte(shapeRow["PCode"]); @@ -1193,8 +1192,11 @@ VALUES { } - if (!(shapeRow["Media"] is System.DBNull)) + if (!(shapeRow["Media"] is System.DBNull) ) + { baseShape.Media = PrimitiveBaseShape.MediaList.FromXml((string)shapeRow["Media"]); + } + return baseShape; } @@ -1573,7 +1575,16 @@ VALUES parameters.Add(_Database.CreateParameter("Texture", s.TextureEntry)); parameters.Add(_Database.CreateParameter("ExtraParams", s.ExtraParams)); parameters.Add(_Database.CreateParameter("State", s.State)); - parameters.Add(_Database.CreateParameter("Media", null == s.Media ? null : s.Media.ToXml())); + + if(null == s.Media ) + { + parameters.Add(_Database.CreateParameter("Media", DBNull.Value)); + } + else + { + parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml())); + } + return parameters.ToArray(); } diff --git a/OpenSim/Data/MSSQL/Resources/AuthStore.migrations b/OpenSim/Data/MSSQL/Resources/AuthStore.migrations index 5b90ca3..eb91296 100644 --- a/OpenSim/Data/MSSQL/Resources/AuthStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/AuthStore.migrations @@ -22,7 +22,11 @@ COMMIT BEGIN TRANSACTION -INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users; +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U')) + INSERT INTO auth (UUID, passwordHash, passwordSalt, webLoginKey, accountType) SELECT [UUID] AS UUID, [passwordHash] AS passwordHash, [passwordSalt] AS passwordSalt, [webLoginKey] AS webLoginKey, 'UserAccount' as [accountType] FROM users; + +COMMIT + + -COMMIT \ No newline at end of file diff --git a/OpenSim/Data/MSSQL/Resources/Avatar.migrations b/OpenSim/Data/MSSQL/Resources/Avatar.migrations index 759e939..5364153 100644 --- a/OpenSim/Data/MSSQL/Resources/Avatar.migrations +++ b/OpenSim/Data/MSSQL/Resources/Avatar.migrations @@ -13,5 +13,28 @@ PRIMARY KEY CLUSTERED ) ON [PRIMARY] +COMMIT + +:VERSION 2 + +BEGIN TRANSACTION + +CREATE TABLE dbo.Tmp_Avatars + ( + PrincipalID uniqueidentifier NOT NULL, + [Name] varchar(32) NOT NULL, + Value text NOT NULL DEFAULT '', + ) ON [PRIMARY] + TEXTIMAGE_ON [PRIMARY] + +IF EXISTS(SELECT * FROM dbo.Avatars) + EXEC('INSERT INTO dbo.Tmp_Avatars (PrincipalID, Name, Value) + SELECT PrincipalID, CONVERT(text, Name), Value FROM dbo.Avatars WITH (HOLDLOCK TABLOCKX)') + +DROP TABLE dbo.Avatars + +EXECUTE sp_rename N'dbo.Tmp_Avatars', N'Avatars', 'OBJECT' + +COMMIT + -COMMIT \ No newline at end of file diff --git a/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations b/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations index f981a91..4d8ab0f 100644 --- a/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/FriendsStore.migrations @@ -15,6 +15,8 @@ COMMIT BEGIN TRANSACTION -INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends; +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[userfriends]') AND type in (N'U')) +INSERT INTO Friends (PrincipalID, Friend, Flags, Offered) +SELECT [ownerID], [friendID], [friendPerms], 0 FROM userfriends; COMMIT \ No newline at end of file diff --git a/OpenSim/Data/MSSQL/Resources/GridStore.migrations b/OpenSim/Data/MSSQL/Resources/GridStore.migrations index d2ca27a..c6342fc 100644 --- a/OpenSim/Data/MSSQL/Resources/GridStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/GridStore.migrations @@ -222,4 +222,17 @@ ALTER TABLE [regions] ADD [Token] varchar(255) NOT NULL DEFAULT 0; COMMIT +:VERSION 8 +BEGIN TRANSACTION +ALTER TABLE regions ALTER COLUMN regionName VarChar(128) + +DROP INDEX IX_regions_name ON dbo.regions +ALTER TABLE regions ALTER COLUMN regionName VarChar(128) null + +CREATE NONCLUSTERED INDEX IX_regions_name ON dbo.regions + ( + regionName + ) WITH( STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] + +COMMIT \ No newline at end of file diff --git a/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations b/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations index e2a8d57..4a3cb27 100644 --- a/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/InventoryStore.migrations @@ -238,7 +238,10 @@ alter table inventoryitems COMMIT - - - +:VERSION 8 +ALTER TABLE inventoryitems +ADD CONSTRAINT DF_inventoryitems_creatorID +DEFAULT '00000000-0000-0000-0000-000000000000' FOR creatorID + +:GO \ No newline at end of file diff --git a/OpenSim/Data/MSSQL/Resources/Presence.migrations b/OpenSim/Data/MSSQL/Resources/Presence.migrations index 35f78e1..bcb6328 100644 --- a/OpenSim/Data/MSSQL/Resources/Presence.migrations +++ b/OpenSim/Data/MSSQL/Resources/Presence.migrations @@ -7,14 +7,7 @@ CREATE TABLE [Presence] ( [RegionID] uniqueidentifier NOT NULL, [SessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', [SecureSessionID] uniqueidentifier NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', -[Online] char(5) NOT NULL DEFAULT 'false', -[Login] char(16) NOT NULL DEFAULT '0', -[Logout] char(16) NOT NULL DEFAULT '0', -[Position] char(64) NOT NULL DEFAULT '<0,0,0>', -[LookAt] char(64) NOT NULL DEFAULT '<0,0,0>', -[HomeRegionID] uniqueidentifier NOT NULL, -[HomePosition] CHAR(64) NOT NULL DEFAULT '<0,0,0>', -[HomeLookAt] CHAR(64) NOT NULL DEFAULT '<0,0,0>', + ) ON [PRIMARY] @@ -27,4 +20,12 @@ BEGIN TRANSACTION CREATE UNIQUE INDEX SessionID ON Presence(SessionID); CREATE INDEX UserID ON Presence(UserID); +COMMIT + +:VERSION 2 + +BEGIN TRANSACTION + +ALTER TABLE Presence ADD LastSeen DateTime + COMMIT \ No newline at end of file diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations index e2e8cbb..340b63d 100644 --- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations @@ -1,4 +1,3 @@ - :VERSION 1 CREATE TABLE [dbo].[prims]( @@ -926,11 +925,121 @@ ALTER TABLE regionsettings ADD loaded_creation_datetime int NOT NULL default 0 COMMIT :VERSION 24 --- Added post 0.7 BEGIN TRANSACTION -ALTER TABLE prims ADD COLUMN MediaURL varchar(255) -ALTER TABLE primshapes ADD COLUMN Media TEXT +ALTER TABLE prims ADD MediaURL varchar(255) +ALTER TABLE primshapes ADD Media TEXT NULL + +COMMIT + +:VERSION 25 + +BEGIN TRANSACTION +CREATE TABLE "regionwindlight" ( + "region_id" varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000', + "water_color_r" [float] NOT NULL DEFAULT '4.000000', + "water_color_g" [float] NOT NULL DEFAULT '38.000000', + "water_color_b" [float] NOT NULL DEFAULT '64.000000', + "water_fog_density_exponent" [float] NOT NULL DEFAULT '4.0', + "underwater_fog_modifier" [float] NOT NULL DEFAULT '0.25', + "reflection_wavelet_scale_1" [float] NOT NULL DEFAULT '2.0', + "reflection_wavelet_scale_2" [float] NOT NULL DEFAULT '2.0', + "reflection_wavelet_scale_3" [float] NOT NULL DEFAULT '2.0', + "fresnel_scale" [float] NOT NULL DEFAULT '0.40', + "fresnel_offset" [float] NOT NULL DEFAULT '0.50', + "refract_scale_above" [float] NOT NULL DEFAULT '0.03', + "refract_scale_below" [float] NOT NULL DEFAULT '0.20', + "blur_multiplier" [float] NOT NULL DEFAULT '0.040', + "big_wave_direction_x" [float] NOT NULL DEFAULT '1.05', + "big_wave_direction_y" [float] NOT NULL DEFAULT '-0.42', + "little_wave_direction_x" [float] NOT NULL DEFAULT '1.11', + "little_wave_direction_y" [float] NOT NULL DEFAULT '-1.16', + "normal_map_texture" varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4', + "horizon_r" [float] NOT NULL DEFAULT '0.25', + "horizon_g" [float] NOT NULL DEFAULT '0.25', + "horizon_b" [float] NOT NULL DEFAULT '0.32', + "horizon_i" [float] NOT NULL DEFAULT '0.32', + "haze_horizon" [float] NOT NULL DEFAULT '0.19', + "blue_density_r" [float] NOT NULL DEFAULT '0.12', + "blue_density_g" [float] NOT NULL DEFAULT '0.22', + "blue_density_b" [float] NOT NULL DEFAULT '0.38', + "blue_density_i" [float] NOT NULL DEFAULT '0.38', + "haze_density" [float] NOT NULL DEFAULT '0.70', + "density_multiplier" [float] NOT NULL DEFAULT '0.18', + "distance_multiplier" [float] NOT NULL DEFAULT '0.8', + "max_altitude" int NOT NULL DEFAULT '1605', + "sun_moon_color_r" [float] NOT NULL DEFAULT '0.24', + "sun_moon_color_g" [float] NOT NULL DEFAULT '0.26', + "sun_moon_color_b" [float] NOT NULL DEFAULT '0.30', + "sun_moon_color_i" [float] NOT NULL DEFAULT '0.30', + "sun_moon_position" [float] NOT NULL DEFAULT '0.317', + "ambient_r" [float] NOT NULL DEFAULT '0.35', + "ambient_g" [float] NOT NULL DEFAULT '0.35', + "ambient_b" [float] NOT NULL DEFAULT '0.35', + "ambient_i" [float] NOT NULL DEFAULT '0.35', + "east_angle" [float] NOT NULL DEFAULT '0.00', + "sun_glow_focus" [float] NOT NULL DEFAULT '0.10', + "sun_glow_size" [float] NOT NULL DEFAULT '1.75', + "scene_gamma" [float] NOT NULL DEFAULT '1.00', + "star_brightness" [float] NOT NULL DEFAULT '0.00', + "cloud_color_r" [float] NOT NULL DEFAULT '0.41', + "cloud_color_g" [float] NOT NULL DEFAULT '0.41', + "cloud_color_b" [float] NOT NULL DEFAULT '0.41', + "cloud_color_i" [float] NOT NULL DEFAULT '0.41', + "cloud_x" [float] NOT NULL DEFAULT '1.00', + "cloud_y" [float] NOT NULL DEFAULT '0.53', + "cloud_density" [float] NOT NULL DEFAULT '1.00', + "cloud_coverage" [float] NOT NULL DEFAULT '0.27', + "cloud_scale" [float] NOT NULL DEFAULT '0.42', + "cloud_detail_x" [float] NOT NULL DEFAULT '1.00', + "cloud_detail_y" [float] NOT NULL DEFAULT '0.53', + "cloud_detail_density" [float] NOT NULL DEFAULT '0.12', + "cloud_scroll_x" [float] NOT NULL DEFAULT '0.20', + "cloud_scroll_x_lock" tinyint NOT NULL DEFAULT '0', + "cloud_scroll_y" [float] NOT NULL DEFAULT '0.01', + "cloud_scroll_y_lock" tinyint NOT NULL DEFAULT '0', + "draw_classic_clouds" tinyint NOT NULL DEFAULT '1', + PRIMARY KEY ("region_id") +) + +COMMIT TRANSACTION + +:VERSION 26 + +BEGIN TRANSACTION + +ALTER TABLE regionsettings ADD map_tile_ID CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' + +COMMIT + +:VERSION 27 #--------------------- -COMMIT \ No newline at end of file +BEGIN TRANSACTION +ALTER TABLE land ADD MediaType VARCHAR(32) NOT NULL DEFAULT 'none/none' +ALTER TABLE land ADD MediaDescription VARCHAR(255) NOT NULL DEFAULT '' +ALTER TABLE land ADD MediaSize VARCHAR(16) NOT NULL DEFAULT '0,0' +ALTER TABLE land ADD MediaLoop bit NOT NULL DEFAULT 0 +ALTER TABLE land ADD ObscureMusic bit NOT NULL DEFAULT 0 +ALTER TABLE land ADD ObscureMedia bit NOT NULL DEFAULT 0 +COMMIT + +:VERSION 28 #--------------------- + +BEGIN TRANSACTION + +ALTER TABLE prims +ADD CONSTRAINT DF_prims_CreatorID +DEFAULT '00000000-0000-0000-0000-000000000000' +FOR CreatorID + +ALTER TABLE prims ALTER COLUMN CreatorID uniqueidentifier NOT NULL + +ALTER TABLE primitems +ADD CONSTRAINT DF_primitems_CreatorID +DEFAULT '00000000-0000-0000-0000-000000000000' +FOR CreatorID + +ALTER TABLE primitems ALTER COLUMN CreatorID uniqueidentifier NOT NULL + +COMMIT diff --git a/OpenSim/Data/MSSQL/Resources/UserAccount.migrations b/OpenSim/Data/MSSQL/Resources/UserAccount.migrations index 8534e23..a81704d 100644 --- a/OpenSim/Data/MSSQL/Resources/UserAccount.migrations +++ b/OpenSim/Data/MSSQL/Resources/UserAccount.migrations @@ -19,7 +19,7 @@ CREATE TABLE [UserAccounts] ( :VERSION 2 BEGIN TRANSACTION - +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[users]') AND type in (N'U')) INSERT INTO UserAccounts (PrincipalID, ScopeID, FirstName, LastName, Email, ServiceURLs, Created) SELECT [UUID] AS PrincipalID, '00000000-0000-0000-0000-000000000000' AS ScopeID, username AS FirstName, lastname AS LastName, -- cgit v1.1 From a7bc187edada1a19e3ef07e148e4d328c0aa1d0e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 28 Apr 2011 07:36:34 -0700 Subject: Added MrMonkE to the contributors. Fixed contributors. --- CONTRIBUTORS.txt | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index ef00c19..246c669 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,34 +1,36 @@ The following people have contributed to OpenSim (Thank you for your effort!) -Add your name in here if you have committed to OpenSim - = Current OpenSim Developers (in very rough order of appearance) = These folks represent the current core team for OpenSim, and are the people that make the day to day of OpenSim happen. +* justincc +* chi11ken (Genkii) +* dahlia +* Melanie Thielker +* Diva (Crista Lopes, University of California, Irvine) +* Dan Lake (Intel) +* Marck +* Mic Bowman (Intel) +* BlueWall (James Hughes) + += Core Developers Following the White Rabbit = +Core developers who have temporarily (we hope) gone chasing the white rabbit. +They are in all similar to the active core developers, except that they haven't +been that active lately, so their voting rights are awaiting their come back. + * MW (Tribal Media AB) * Adam Frisby (DeepThink Pty Ltd) -* MingChen (DeepThink Pty Ltd) * lbsa71 (Tribal Media AB) -* Sean Dague / sdague (IBM) -* Tedd -* justincc * Teravus (w3z) -* Johan Berntsson (3Di) * Ckrinke (Charles Krinke) -* chi11ken (Genkii) -* adjohn (Genkii) * Dr Scofield aka Dirk Husemann (IBM Research - Zurich) -* dahlia * mikem (3Di) -* Melanie Thielker * Homer_Horwitz -* idb (Ian Brown) -* Diva (Crista Lopes, University of California, Irvine) * nlin (3Di) * Arthur Rodrigo S Valadares (IBM) -* BlueWall (James Hughes) +* John Hurliman = Past Open Sim Developers = These folks are alumns of the OpenSim core group, but are now @@ -44,6 +46,12 @@ where we are today. * Dalien * Darok * Alondria +* Sean Dague / sdague (IBM) +* Tedd +* MingChen (DeepThink Pty Ltd) +* adjohn (Genkii) +* idb (Ian Brown) +* Johan Berntsson (3Di) = Additional OpenSim Contributors = @@ -102,6 +110,7 @@ what it is today. * Misterblue (Intel) * Mircea Kitsune * mpallari +* MrMonkE * nornalbion * Omar Vera Ustariz (IBM) * openlifegrid.com -- cgit v1.1