Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts:
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -817,7 +817,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (!udpClient.IsConnected)
             {
-//                m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
+                m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
                 return;
             }
 

bin/Regions/Regions.ini.example

@@ -1,47 +0,0 @@
-; * This is an example region config file.
-; * 
-; * If OpenSimulator is started up without any regions, it will ask you configuration questions to generate a Regions.ini file for you.
-; * So there is no need to change this file directly, it is only for reference.
-; * However, if you prefer you can also copy this file to Regions.ini and appropriately change the parameters below.
-; * Only files ending with .ini and .xml in this directly will be loaded by OpenSimulator.
-; *
-; * You can multiple regions into one file or make one file per region
-; * The section name is the region name
-; *
-
-[Default Region]
-
-; *
-; * You MUST change this! It will NOT be done for you!
-; *
-
-RegionUUID = "11111111-2222-3333-4444-555555555555"
-
-Location = "1000,1000"
-InternalAddress = "127.0.0.1"
-InternalPort = 9000
-AllowAlternatePorts = False
-ExternalHostName = "SYSTEMIP"
-
-; *
-; * Prim data
-; * This allows limiting the sizes of prims and the region prim count
-; *
-
-; NonphysicalPrimMax = 256
-; PhysicalPrimMax = 10
-; ClampPrimSize = False
-; MaxPrims = 15000
-; MaxAgents = 100
-
-; *
-; * Multi-Tenancy. Only set if needed
-; *
-
-; ScopeID = "00000000-0000-0000-0000-000000000000"
-
-; *
-; * Product name (used in search from viewer 1.23
-; *
-
-; RegionType = "Mainland"

prebuild.xml

@@ -1753,6 +1753,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
       <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Region.Framework.Interfaces"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Server.Handlers"/>
@@ -3123,6 +3124,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Region.Framework.Interfaces"/>
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Region.OptionalModules"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>