Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

14 files changed, 41 insertions, 116 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1f3cd0d..2c85f9d 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -790,7 +790,9 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
-
+[Terrain]
+    ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
+    ; InitialTerrain = "pinhead-island"
 
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8671e31..f4e3d9e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1512,6 +1512,9 @@
     ;; Enable Non Player Character (NPC) facilities
     Enabled = false
 
+[Terrain]
+    InitialTerrain = "pinhead-island"
+
 ;; 
 ;; If you are using a simian grid frontend you can enable
 ;; this module to upload tile images for the mapping fn
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index db9f08b..d98c826 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -66,6 +66,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
+    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 326caeb..691bfdc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -58,6 +58,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
+    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
diff --git a/bin/ScriptEngines/Default.lsl b/bin/ScriptEngines/Default.lsl
deleted file mode 100644
index ade855d..0000000
--- a/bin/ScriptEngines/Default.lsl
+++ /dev/null
@@ -1,104 +0,0 @@
-// autogenerated by generate_default_lsl.rb
-integer touch_count = 0;
-
-default {
-  touch_start(integer total_number) {
-    float angle45 = PI/4.0; // 45 degrees
-    float angle30 = PI/6.0; // 30 degrees
-    float sqrt2 = llSqrt(2.0);
-    if((llFabs(-1.5) != 1.5) || (llFabs(10.4) != 10.4)) {
-      llShout(0, "Houston, we have a big problem! llFabs() does not work! Need it for other tests!");
-    }
-    llSetText("This is a text by llSetText", <1,0,0>, 1);
-    llWhisper(0, "llWhispering a few random numbers between 0 and 100: " + llFrand(100) + "," + llFrand(100) + "," + llFrand(100) + "," + llFrand(100));
-    llShout(0, "llShouting the unix time: " + llGetUnixTime() + ", and region corner: " + llGetRegionCorner());
-    llShout(1, "Shouting a random number between 0 and 100 on the channel#1: " + llFrand(100));
-    if (llAbs(-1) != 1) {
-      llSay(0, "Assert failed: llAbs(-1) != 1");
-    }
-    if (llAbs(10) != 10) {
-      llSay(0, "Assert failed: llAbs(10) != 10");
-    }
-    if (llFabs((llCos(angle45) - sqrt2/2.0) - 0) > 0.000001) {
-      llSay(0, "Assert failed: (llCos(angle45) - sqrt2/2.0) differs from 0 by more than 0.000001");
-      llSay(0, " --> The actual result: " + (llCos(angle45) - sqrt2/2.0));
-    }
-    if (llFabs((llSin(angle30) - 0.5) - 0) > 0.000001) {
-      llSay(0, "Assert failed: (llSin(angle30) - 0.5) differs from 0 by more than 0.000001");
-      llSay(0, " --> The actual result: " + (llSin(angle30) - 0.5));
-    }
-    if (llFabs((llAtan2(1, 1)*4 - PI) - 0) > 0.000001) {
-      llSay(0, "Assert failed: (llAtan2(1, 1)*4 - PI) differs from 0 by more than 0.000001");
-      llSay(0, " --> The actual result: " + (llAtan2(1, 1)*4 - PI));
-    }
-    if (llFabs((llTan(PI)) - 0) > 0.000001) {
-      llSay(0, "Assert failed: (llTan(PI)) differs from 0 by more than 0.000001");
-      llSay(0, " --> The actual result: " + (llTan(PI)));
-    }
-    if (llFloor(2.4) != 2) {
-      llSay(0, "Assert failed: llFloor(2.4) != 2");
-    }
-    if (llCeil(2.4) != 3) {
-      llSay(0, "Assert failed: llCeil(2.4) != 3");
-    }
-    if (llRound(2.4) != 2) {
-      llSay(0, "Assert failed: llRound(2.4) != 2");
-    }
-    if (llFloor(2.5) != 2) {
-      llSay(0, "Assert failed: llFloor(2.5) != 2");
-    }
-    if (llCeil(2.5) != 3) {
-      llSay(0, "Assert failed: llCeil(2.5) != 3");
-    }
-    if (llRound(2.5) != 3) {
-      llSay(0, "Assert failed: llRound(2.5) != 3");
-    }
-    if (llFloor(2.51) != 2) {
-      llSay(0, "Assert failed: llFloor(2.51) != 2");
-    }
-    if (llCeil(2.51) != 3) {
-      llSay(0, "Assert failed: llCeil(2.51) != 3");
-    }
-    if (llRound(2.51) != 3) {
-      llSay(0, "Assert failed: llRound(2.51) != 3");
-    }
-    if (llFloor(3.49) != 3) {
-      llSay(0, "Assert failed: llFloor(3.49) != 3");
-    }
-    if (llCeil(3.49) != 4) {
-      llSay(0, "Assert failed: llCeil(3.49) != 4");
-    }
-    if (llRound(3.49) != 3) {
-      llSay(0, "Assert failed: llRound(3.49) != 3");
-    }
-    if (llFloor(3.5000001) != 3) {
-      llSay(0, "Assert failed: llFloor(3.5000001) != 3");
-    }
-    if (llCeil(3.5000001) != 4) {
-      llSay(0, "Assert failed: llCeil(3.5000001) != 4");
-    }
-    if (llRound(3.5000001) != 4) {
-      llSay(0, "Assert failed: llRound(3.5000001) != 4");
-    }
-    if (llFloor(3.51) != 3) {
-      llSay(0, "Assert failed: llFloor(3.51) != 3");
-    }
-    if (llCeil(3.51) != 4) {
-      llSay(0, "Assert failed: llCeil(3.51) != 4");
-    }
-    if (llRound(3.51) != 4) {
-      llSay(0, "Assert failed: llRound(3.51) != 4");
-    }
-    if ((llFabs(0-llPow(2, 16))) != 65536) {
-      llSay(0, "Assert failed: (llFabs(0-llPow(2, 16))) != 65536");
-    }
-    if (llMD5String("Hello, Avatar!",0) != "112abd47ceaae1c05a826828650434a6") {
-      llSay(0, "Assert failed: llMD5String('Hello, Avatar!',0) != '112abd47ceaae1c05a826828650434a6'");
-    }
-    if (llModPow(2, 16, 37) != 9) {
-      llSay(0, "Assert failed: llModPow(2, 16, 37) != 9");
-    }
-    touch_count++;
-    llSay(0, "Object was touched. Touch count: " + touch_count);
-  }
-}
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index da860c6..95d6264 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -14,6 +14,7 @@
     AvatarServices                      = "RemoteAvatarServicesConnector"
     NeighbourServices           = "RemoteNeighbourServicesConnector"
     AuthenticationServices      = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     PresenceServices            = "RemotePresenceServicesConnector"
     UserAccountServices         = "RemoteUserAccountServicesConnector"
     GridUserServices            = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 712481d..fa6f525 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -146,3 +146,13 @@
 
 [MapImageService]
         MapImageServerURI = "http://mygridserver.com:8003"
+
+[AuthorizationService]
+        ; If you have regions with access restrictions
+        ; specify them here using the convention
+        ; Region_<Region_Name> = <flags>
+        ; Valid flags are:
+        ; DisallowForeigners -- HG visitors not allowed
+        ; DisallowResidents -- only Admins and Managers allowed
+        ; Example:
+        ; Region_Test_1 = "DisallowForeigners"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5f0ba37..31a4059 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,6 +17,7 @@
     AvatarServices                      = "RemoteAvatarServicesConnector"
     NeighbourServices           = "RemoteNeighbourServicesConnector"
     AuthenticationServices      = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     PresenceServices            = "RemotePresenceServicesConnector"
     UserAccountServices         = "RemoteUserAccountServicesConnector"
     GridUserServices            = "RemoteGridUserServicesConnector"
@@ -26,6 +27,7 @@
     LandServices            = "RemoteLandServicesConnector"
         FriendsModule                   = "HGFriendsModule"
         MapImageService                 = "MapImageServiceModule"
+        UserManagementModule    = "HGUserManagementModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 6ad4ac9..d307387 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -9,6 +9,7 @@
     InventoryServices       = "LocalInventoryServicesConnector"
     NeighbourServices       = "LocalNeighbourServicesConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserAccountServices     = "LocalUserAccountServicesConnector"
@@ -47,9 +48,6 @@
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2f39218..4c734a1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -44,6 +44,7 @@
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [AssetService]
+    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
@@ -231,3 +232,13 @@
 [MapImageService]
         ; Set this if you want to change the default
         ; TilesStoragePath = "maptiles"
+
+[AuthorizationService]
+        ; If you have regions with access restrictions
+        ; specify them here using the convention
+        ; Region_<Region_Name> = <flags>
+        ; Valid flags are:
+        ; DisallowForeigners -- HG visitors not allowed
+        ; DisallowResidents -- only Admins and Managers allowed
+        ; Example:
+        ; Region_Test_1 = "DisallowForeigners"
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 00beb31..ee51067 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,6 +12,7 @@
     InventoryServices           = "HGInventoryBroker"
     NeighbourServices           = "LocalNeighbourServicesConnector"
     AuthenticationServices      = "LocalAuthenticationServicesConnector"
+    AuthorizationServices       = "LocalAuthorizationServicesConnector"
     GridServices                        = "LocalGridServicesConnector"
     PresenceServices            = "LocalPresenceServicesConnector"
     UserAccountServices         = "LocalUserAccountServicesConnector"
@@ -22,6 +23,7 @@
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
     FriendsModule                       = "HGFriendsModule"
+        UserManagementModule    = "HGUserManagementModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -68,9 +70,6 @@
         LibraryName = "OpenSim Library"
         DefaultLibrary = "./inventory/Libraries.xml"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt
index ec76ec2..4397749 100644
--- a/bin/shutdown_commands.txt
+++ b/bin/shutdown_commands.txt
@@ -1 +1,3 @@
-backup
+; You can place simulator console commands here to execute when the simulator is shut down
+; e.g. show stats
+; Lines starting with ; are comments
diff --git a/bin/startup_commands.txt b/bin/startup_commands.txt
new file mode 100644
index 0000000..1abfa64
--- /dev/null
+++ b/bin/startup_commands.txt
@@ -0,0 +1,3 @@
+; You can place region console commands here to execute once the simulator has finished starting up 
+; e.g. show stats
+; Lines start with ; are comments.
diff --git a/bin/startup_commands.txt.example b/bin/startup_commands.txt.example
deleted file mode 100644
index 3dba4b3..0000000
--- a/bin/startup_commands.txt.example
+++ /dev/null
@@ -1,4 +0,0 @@
-terrain load-tile f32 islandterrain_1024x512.raw 512 1024 1000 1000
-terrain multiply 0.1
-terrain add 5
-