18 files changed, 112 insertions, 128 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a820ddf..50366a6 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -36,7 +36,6 @@
 
 
 [Startup]
-
     ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
     ;; Console prompt
     ;; Certain special characters can be used to customize the prompt
@@ -173,6 +172,7 @@
 
     ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
     ;; Permission modules to use, separated by comma.
+    ;; Possible modules are DefaultPermissionsModule, PrimLimitsModule
     ; permissionmodules = DefaultPermissionsModule
 
     ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
@@ -194,6 +194,15 @@
     ; region_manager_is_god = false
     ; parcel_owner_is_god = true
 
+    ;; More control over permissions
+    ;; This is definitely not SL!
+    ; Provides a simple control for land owners to give build rights to specific avatars
+    ; in publicly accessible parcels that disallow object creation in general. 
+    ; Owners specific avatars by adding them to the Access List of the parcel
+    ; without having to use the Groups feature
+    ; simple_build_permissions = false
+
+
     ;; Default script engine to use. Currently, we only have XEngine
     ; DefaultScriptEngine = "XEngine"
 
@@ -232,6 +241,24 @@
     ;; server to send mail through.
     ; emailmodule = DefaultEmailModule
 
+[Estates]
+    ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
+        ; If these values are uncommented then they will be used to create a default estate as necessary.
+    ; New regions will be automatically assigned to that default estate.
+        
+    ; DefaultEstateName = My Estate
+    ; DefaultEstateOwnerName = FirstName LastName
+        
+    ; The following parameters will only be used on a standalone system to create an estate owner that does not already exist
+
+    ; If DefaultEstateOwnerUUID is left at UUID.Zero (as below) then a random UUID will be assigned.
+    ; This is normally what you want
+    ; DefaultEstateOwnerUUID = 00000000-0000-0000-0000-000000000000
+
+    ; DefaultEstateOwnerEMail = owner@domain.com
+    ; DefaultEstateOwnerPassword = password
+
+
 [SMTP]
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.
@@ -753,8 +780,7 @@
     ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
-
-
+        
 [InterestManagement]
      ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
      ;; This section controls how state updates are prioritized for each client
@@ -773,12 +799,9 @@
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
 
-
-[PrimLimitsModule]
-    ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false
-    ;; Enable parcel prim limits.  Off by default to emulate pre-existing behavior.
-    ; EnforcePrimLimits = 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 fab2c47..28c5587 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -177,6 +177,11 @@
     ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
     MaximumTimeBeforePersistenceConsidered = 600
 
+    ; Experimental setting to resend appearance updates every 60 seconds.
+    ; These packets are small and this can help with grey avatar syndrome.
+    ; Default is false
+    SendPeriodicAppearanceUpdates = false
+
     ; ##
     ; ## PHYSICS
     ; ##
@@ -260,6 +265,14 @@
     ; Default value is all
     ; allowed_script_editors = all
 
+    ; Provides a simple control for land owners to give build rights to specific avatars
+    ; in publicly accessible parcels that disallow object creation in general. 
+    ; Owners specific avatars by adding them to the Access List of the parcel
+    ; without having to use the Groups feature
+    ; Disabled by default
+    ; simple_build_permissions = False
+
+
     ; ##
     ; ## SCRIPT ENGINE
     ; ##
@@ -833,10 +846,12 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0
+    AvatarFriction = 0.2
+    AvatarRestitution = 0.0
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
+    AvatarContactProcessingThreshold = 0.1;
 
     MaxObjectMass = 10000.01
 
@@ -849,6 +864,15 @@
     CcdMotionThreshold = 0.0
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
+    ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
+    MaxPersistantManifoldPoolSize = 0;
+    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldForceUpdateAllAabbs = False;
+    ShouldRandomizeSolverOrder = False;
+    ShouldSplitSimulationIslands = False;
+    ShouldEnableFrictionCaching = False;
+    NumberOfSolverIterations = 0;   
+
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
@@ -1512,6 +1536,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 ab5880d..e0242ab 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -241,6 +241,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; For V2 map
     MapTileURL = "http://127.0.0.1:8002";
 
+    ; For WebProfiles (V3)
+    ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
+
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
     
@@ -392,8 +395,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     HomeURI = "http://127.0.0.1:8002"
 
 [HGFriendsService]
-    LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
-    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
+        UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+        UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        GridService = "OpenSim.Services.GridService.dll:GridService"
+        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [HGInstantMessageService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 90f7b5c..69e94a5 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -224,6 +224,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; For V2 map
     MapTileURL = "http://127.0.0.1:8002";
 
+    ; For V2/3 Web Profiles
+    ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
+
+    ; For V2/V3 webapp authentication SSO
+    OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
+
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
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..3dfbed7 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -231,3 +231,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"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 00beb31..75c4788 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"
 
@@ -160,8 +159,12 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
 [HGFriendsService]
-        LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
+        LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService"
         UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+        FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
+        UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+        GridService = "OpenSim.Services.GridService.dll:GridService"
+        PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
 
 [HGInstantMessageService]
         LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index d1571cf..5bef6e9 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
new file mode 100755
index 0000000..9882f5b
--- /dev/null
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index ec21dfe..9f09ef8 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
new file mode 100755
index 0000000..fa47bf1
--- /dev/null
+++ b/bin/lib64/libBulletSim.so
diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt
deleted file mode 100644
index ec76ec2..0000000
--- a/bin/shutdown_commands.txt
+++ /dev/null
@@ -1 +0,0 @@
-backup
diff --git a/bin/shutdown_commands.txt.example b/bin/shutdown_commands.txt.example
new file mode 100644
index 0000000..dc07dc9
--- /dev/null
+++ b/bin/shutdown_commands.txt.example
@@ -0,0 +1,3 @@
+; Copy this file to shutdown_commands.txt to execute region console commands when the simulator is asked to shut down
+; e.g. show stats
+; Lines that start with ; are comments
diff --git a/bin/startup_commands.txt.example b/bin/startup_commands.txt.example
index 3dba4b3..677109c 100644
--- a/bin/startup_commands.txt.example
+++ b/bin/startup_commands.txt.example
@@ -1,4 +1,3 @@
-terrain load-tile f32 islandterrain_1024x512.raw 512 1024 1000 1000
-terrain multiply 0.1
-terrain add 5
-
+; Copy this file to startup_commands.txt to run region console commands once the simulator has finished starting up
+; e.g. show stats
+; Lines that start with ; are comments.