From 67bea681e2a75039595be9dab23ad157d123e597 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 21 Feb 2012 23:04:49 -0500
Subject: Add web profile url setting to ini

---
 bin/Robust.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 90f7b5c..91cd6d0 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -224,6 +224,9 @@ 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]
+
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
-- 
cgit v1.1


From 165ae251ec132da30dc58513101e4ec438df8d2f Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 22 Feb 2012 16:36:28 -0500
Subject: V3 Support

	The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
---
 bin/Robust.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 91cd6d0..326caeb 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -227,6 +227,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; 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
 
-- 
cgit v1.1


From ac934e2dbb57f9ba42ed1b2405e294c802f05616 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 4 Mar 2012 11:11:01 -0500
Subject: Add WebProfiles config to other config example

---
 bin/Robust.HG.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ab5880d..db9f08b 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
     
-- 
cgit v1.1


From d6ebf2d6cacd6341fb65b4c124d358aa8c1c86f8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 10 Mar 2012 01:27:05 +0000
Subject: Add ability to specify a default estate to be used when creating
 regions.

This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
---
 bin/OpenSim.ini.example | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a820ddf..08a6194 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
@@ -232,6 +231,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 +770,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
-- 
cgit v1.1


From 1547fe959eed6ad9343c65adf7fb7484732c90ca Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Mar 2012 16:06:35 +0000
Subject: Change OpenSim.ini.example to reflect how to actually enable prim
 limits, as opposed to how it was first designed.

---
 bin/OpenSim.ini.example | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 08a6194..1f3cd0d 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -172,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
@@ -790,11 +791,6 @@
     ; 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
-
 
 [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
-- 
cgit v1.1


From 34f6f87b6cbea176805b5802804af9be89284f99 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Mar 2012 01:51:16 +0000
Subject: Remove unused bin/ScriptEngines/Default.lsl

It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default.
At this location it would also stop an easy manual deletion of script engine compiles and state.
---
 bin/ScriptEngines/Default.lsl | 104 ------------------------------------------
 1 file changed, 104 deletions(-)
 delete mode 100644 bin/ScriptEngines/Default.lsl

(limited to 'bin')

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);
-  }
-}
-- 
cgit v1.1


From b19be657b6e032321fe4b55b8751d609d9921384 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Mar 2012 02:10:59 +0000
Subject: Remove unnecessary "backup" command in shutdown_commands.txt

The simulator is already doing this internally.
---
 bin/shutdown_commands.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt
index ec76ec2..640c41a 100644
--- a/bin/shutdown_commands.txt
+++ b/bin/shutdown_commands.txt
@@ -1 +1,2 @@
-backup
+; You can place simulator console commands here to execute when the simulator is shut down
+; e.g. show stats
-- 
cgit v1.1


From 78e992dbd0bbc0b99dd01b1c6c303098d99aac55 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Mar 2012 02:13:45 +0000
Subject: Move startup_commands.txt.example to startup_commands.txt for
 consistency with the existing shutdown_commands.txt.

Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
---
 bin/shutdown_commands.txt        | 1 +
 bin/startup_commands.txt         | 3 +++
 bin/startup_commands.txt.example | 4 ----
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 bin/startup_commands.txt
 delete mode 100644 bin/startup_commands.txt.example

(limited to 'bin')

diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt
index 640c41a..4397749 100644
--- a/bin/shutdown_commands.txt
+++ b/bin/shutdown_commands.txt
@@ -1,2 +1,3 @@
 ; 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
-
-- 
cgit v1.1


From a2009ffe2e71afefad79471811418df8958870ab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 16 Mar 2012 13:08:05 -0700
Subject: Terrain: added [Terrain] section with an option to load an initial
 flat terrain. Default is still pinhead island. I much rather have a flat land
 in the beginning.

---
 bin/OpenSim.ini.example | 4 +++-
 bin/OpenSimDefaults.ini | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin')

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 fab2c47..fd31131 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
-- 
cgit v1.1


From 33c14cb107ecb67a3e971d6adaab17d173d52747 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 10:00:11 -0700
Subject: Region access control! Region operators can now specify things like
 DisallowForeigners (means what it says) and DisallowResidents (means that
 only admins and managers can get into the region). This puts the
 never-completed AuthorizationService to good use. Note that I didn't
 implement a grid-wide Authorization service; this service implementation is
 done entirely locally on the simulator. This can be changed as usual by
 pluging in a different AuthorizationServicesConnector.

---
 bin/config-include/Grid.ini                     |  1 +
 bin/config-include/GridCommon.ini.example       | 10 ++++++++++
 bin/config-include/GridHypergrid.ini            |  1 +
 bin/config-include/Standalone.ini               |  4 +---
 bin/config-include/StandaloneCommon.ini.example | 10 ++++++++++
 bin/config-include/StandaloneHypergrid.ini      |  4 +---
 6 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'bin')

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..da447f1 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"
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..2a7e49e 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"
\ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 00beb31..286d0a1 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"
@@ -68,9 +69,6 @@
 	LibraryName = "OpenSim Library"
 	DefaultLibrary = "./inventory/Libraries.xml"
 
-[AuthorizationService]
-    LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
-
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
-- 
cgit v1.1


From 92b1ade78ea51ca1499298476fe7cc7ce4e955cc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 15:01:10 -0700
Subject: BAD JUSTIN! People using standalone in master, please update your
 StandaloneCommon.ini according to this change. People using robust in master,
 please update your Robust.HG.ini.example[.HG].ini according to this change.

---
 bin/Robust.HG.ini.example                       | 1 +
 bin/Robust.ini.example                          | 1 +
 bin/config-include/StandaloneCommon.ini.example | 1 +
 3 files changed, 3 insertions(+)

(limited to 'bin')

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/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2a7e49e..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"
 
-- 
cgit v1.1


From 7dfa0309c63263fb15dc9e3883f5717f28e21c0c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 17 Mar 2012 15:36:20 -0700
Subject: More on HG access control. This commit splits the
 UserManagementModule into the Basic one and the HG one, so that we can do
 everything that needs to be done for HG ACLs to work without interfering with
 the vanilla opensim. For the moment, it finds foreign users who have left a
 trace in the region, e.g. an object. This makes it possible to ban/IM/etc
 these users using the regular avatar picker. TODO: contact the UAS directly
 given a name of the form First.Last @foo.com.

---
 bin/config-include/GridHypergrid.ini       | 1 +
 bin/config-include/StandaloneHypergrid.ini | 1 +
 2 files changed, 2 insertions(+)

(limited to 'bin')

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index da447f1..31a4059 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -27,6 +27,7 @@
     LandServices            = "RemoteLandServicesConnector"
 	FriendsModule			= "HGFriendsModule"
 	MapImageService			= "MapImageServiceModule"
+	UserManagementModule	= "HGUserManagementModule"
     
     LandServiceInConnector			= true
     NeighbourServiceInConnector		= true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 286d0a1..ee51067 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -23,6 +23,7 @@
     EntityTransferModule	= "HGEntityTransferModule"
     InventoryAccessModule	= "HGInventoryAccessModule"
     FriendsModule			= "HGFriendsModule"
+	UserManagementModule	= "HGUserManagementModule"
     
     InventoryServiceInConnector			= true
     AssetServiceInConnector				= true
-- 
cgit v1.1


From ab54ce1907e26935bfb847742d4f5aa95d34aca0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Mar 2012 00:18:04 +0000
Subject: Fix configuration problems where XAssetDatabasePlugin was picked up
 accidentally.

The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade.  There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files.
This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places).
Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
---
 bin/Robust.HG.ini.example                       | 1 -
 bin/Robust.ini.example                          | 1 -
 bin/config-include/StandaloneCommon.ini.example | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d98c826..db9f08b 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -66,7 +66,6 @@ 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 691bfdc..326caeb 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -58,7 +58,6 @@ 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/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4c734a1..3dfbed7 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -44,7 +44,6 @@
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [AssetService]
-    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
@@ -241,4 +240,4 @@
 	; DisallowForeigners -- HG visitors not allowed
 	; DisallowResidents -- only Admins and Managers allowed
 	; Example:
-	; Region_Test_1 = "DisallowForeigners"
\ No newline at end of file
+	; Region_Test_1 = "DisallowForeigners"
-- 
cgit v1.1


From 4972491efb0d83e0963445bfbeeaeee41b5e38e6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 19 Mar 2012 00:29:02 +0000
Subject: Move startup/shutdown command .txt files to .txt.example files to
 avoid clobbering on updates.

Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
---
 bin/shutdown_commands.txt         | 3 ---
 bin/shutdown_commands.txt.example | 3 +++
 bin/startup_commands.txt          | 3 ---
 bin/startup_commands.txt.example  | 3 +++
 4 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 bin/shutdown_commands.txt
 create mode 100644 bin/shutdown_commands.txt.example
 delete mode 100644 bin/startup_commands.txt
 create mode 100644 bin/startup_commands.txt.example

(limited to 'bin')

diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt
deleted file mode 100644
index 4397749..0000000
--- a/bin/shutdown_commands.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-; 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/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 b/bin/startup_commands.txt
deleted file mode 100644
index 1abfa64..0000000
--- a/bin/startup_commands.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-; 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
new file mode 100644
index 0000000..677109c
--- /dev/null
+++ b/bin/startup_commands.txt.example
@@ -0,0 +1,3 @@
+; 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.
-- 
cgit v1.1


From d08ad6459a03a6a5a6a551fd2b275f1c7da94d8e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 20 Mar 2012 17:14:19 -0700
Subject: HG Friends: allow the establishment of HG friendships without
 requiring co-presence in the same sim. Using avatar picker, users can now
 search for names such as "first.last@grid.com:9000", find them, and request
 friendship. Friendship requests are stored if target user is offline. TESTED
 ON STANDALONE ONLY.

---
 bin/config-include/StandaloneHypergrid.ini | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ee51067..75c4788 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -159,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"
-- 
cgit v1.1


From 91cc09b7bf5dd876a74413855b75a1197e3813e4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 20 Mar 2012 21:36:24 -0700
Subject: HG Friends config for Robust.HG.ini.example

---
 bin/Robust.HG.ini.example | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index db9f08b..e0242ab 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -395,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"
-- 
cgit v1.1


From 06c81a2afe4d3c4060863cbb7736776ebf77bfba Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 21 Mar 2012 20:31:51 -0400
Subject: Fix typo

	Add enclosing " to urls
---
 bin/Robust.ini.example | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 326caeb..69e94a5 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -225,10 +225,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     MapTileURL = "http://127.0.0.1:8002";
 
     ; For V2/3 Web Profiles
-    ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]
+    ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
 
     ; For V2/V3 webapp authentication SSO
-    OpenIDServerURL = "http://127.0.0.1/openid/openidserver/
+    OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
 
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
-- 
cgit v1.1


From 6146e7ef258b10888ad7464b72b75cca701e02c9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 22 Mar 2012 12:57:12 -0700
Subject: Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY
 DEFAULT. Turns out that this can't be expressed by cascading Permission
 modules, so I did it as per this patch.

---
 bin/OpenSim.ini.example | 8 ++++++++
 bin/OpenSimDefaults.ini | 7 +++++++
 2 files changed, 15 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2c85f9d..01dc1d6 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -194,6 +194,14 @@
     ; 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"
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fd31131..1a0d801 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -260,6 +260,13 @@
     ; Default value is all
     ; allowed_script_editors = all
 
+    ; Provides a simple control for land owners to give build rights to
+    ; 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
     ; ##
-- 
cgit v1.1


From 45b588cf008c514f461bf43c168dcdc9902b7bb9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Mar 2012 20:10:38 +0000
Subject: Revert "Simple build permissions feature. NOTE: EXPERIMENTAL,
 DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading
 Permission modules, so I did it as per this patch."

This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
---
 bin/OpenSim.ini.example | 8 --------
 bin/OpenSimDefaults.ini | 7 -------
 2 files changed, 15 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 01dc1d6..2c85f9d 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -194,14 +194,6 @@
     ; 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"
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1a0d801..fd31131 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -260,13 +260,6 @@
     ; Default value is all
     ; allowed_script_editors = all
 
-    ; Provides a simple control for land owners to give build rights to
-    ; 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
     ; ##
-- 
cgit v1.1


From 25e5b6a76c4cc517306d25a692e1c147507238f0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 22 Mar 2012 14:21:07 -0700
Subject: Added new simple_build_permissions config to the .ini and .example
 files.

---
 bin/OpenSim.ini.example | 9 +++++++++
 bin/OpenSimDefaults.ini | 8 ++++++++
 2 files changed, 17 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2c85f9d..50366a6 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -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"
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fd31131..3470b82 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -260,6 +260,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
     ; ##
-- 
cgit v1.1


From e5b182fb41fb78a271b45f40e3d50e387bc38ad8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Mar 2012 03:37:59 +0000
Subject: Add information about SendPeriodicAppearanceUpdates to
 OpenSimDefaults.ini for now.

Default remains false.
---
 bin/OpenSimDefaults.ini | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3470b82..6986046 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
     ; ##
-- 
cgit v1.1


From 6c504426252668a7d366705e49ca1ba642367412 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Mar 2012 14:05:01 -0700
Subject: BulletSim: update BulletSim.dll to Bullet 2.80 and add
 libBulletSim.so to the new lib32 and lib64 binary directories

---
 bin/lib32/BulletSim.dll   | Bin 562176 -> 566784 bytes
 bin/lib32/libBulletSim.so | Bin 0 -> 618542 bytes
 bin/lib64/BulletSim.dll   | Bin 768000 -> 773632 bytes
 bin/lib64/libBulletSim.so | Bin 0 -> 684103 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 bin/lib32/libBulletSim.so
 create mode 100755 bin/lib64/libBulletSim.so

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index d1571cf..82d9737 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
new file mode 100755
index 0000000..f93f7d7
Binary files /dev/null and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index ec21dfe..f922ccc 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
new file mode 100755
index 0000000..c0c859f
Binary files /dev/null and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From b22d0401693dad44790d4cbf58d85c0fe3870460 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Mar 2012 16:37:21 -0700
Subject: BulletSim: add some new runtime setable parameters to match the dll.

---
 bin/OpenSimDefaults.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6986046..1216bce 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -846,7 +846,7 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0
+    AvatarFriction = 0.5
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
-- 
cgit v1.1


From de24feb275ddd1c7e7c0b04900718a9000b8d49b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 18 Mar 2012 11:53:53 -0700
Subject: BulletSim: Add AvatarRestitution parameter. Centralize computation of
 buoyancy for flying. Tweek avatar default friction and resititution

---
 bin/OpenSimDefaults.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1216bce..a31e6f4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -846,7 +846,8 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0.5
+    AvatarFriction = 0.2
+    AvatarRestitution = 0.0
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
-- 
cgit v1.1


From 2f6e8564fe01a4a6421fdda5acdf41aef99cce8a Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 21 Mar 2012 17:24:17 -0700
Subject: BulletSim: add updated (but not working) BulletSim dlls

---
 bin/lib32/BulletSim.dll   | Bin 566784 -> 532480 bytes
 bin/lib32/libBulletSim.so | Bin 618542 -> 618538 bytes
 bin/lib64/BulletSim.dll   | Bin 773632 -> 684544 bytes
 bin/lib64/libBulletSim.so | Bin 684103 -> 684103 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 82d9737..7811c46 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index f93f7d7..dd2c5ee 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index f922ccc..b8a4ed0 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index c0c859f..3ee7cbf 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 142de1d02f086c80888eb216cfd31b84ec27a79b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Mar 2012 10:59:40 -0700
Subject: BulletSim: add a bunch of internal Bullet configuration parameters to
 OpenSimDefaults.ini and the code.

---
 bin/OpenSimDefaults.ini | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a31e6f4..34f70a2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -851,6 +851,7 @@
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
+    AvatarContactProcessingThreshold = 0.1;
 
     MaxObjectMass = 10000.01
 
@@ -863,6 +864,14 @@
     CcdMotionThreshold = 0.0
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
+    MaxPersistantManifoldPoolSize = 0;
+    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldForceUpdateAllAabbs = False;
+    ShouldRandomizeSolverOrder = False;
+    ShouldSplitSimulationIslands = False;
+    ShouldEnableFrictionCaching = False;
+    NumberOfSolverIterations = 0;   
+
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
-- 
cgit v1.1


From ff54b3c3661a6bf9d5f0d9a24f8aeed5b42ce0ce Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Mar 2012 15:50:32 -0700
Subject: BulletSim: change default of
 shouldDisableContactPoolDynamicAllocation from False to True. It seems that
 collisions don't happen well when it is False (things fall through terrain).

---
 bin/OpenSimDefaults.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 34f70a2..41be415 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -865,7 +865,7 @@
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
     MaxPersistantManifoldPoolSize = 0;
-    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldDisableContactPoolDynamicAllocation = True;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;
-- 
cgit v1.1


From 3691e39178ccc569ee96fdeeefe16324c779f127 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 26 Mar 2012 08:48:51 -0700
Subject: BulletSim: update BulletSim.dll and libBulletSim.so with latest
 versions

---
 bin/lib32/BulletSim.dll   | Bin 532480 -> 533504 bytes
 bin/lib32/libBulletSim.so | Bin 618538 -> 619149 bytes
 bin/lib64/BulletSim.dll   | Bin 684544 -> 685056 bytes
 bin/lib64/libBulletSim.so | Bin 684103 -> 688874 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 7811c46..357f26e 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index dd2c5ee..948d8e3 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index b8a4ed0..db8530c 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 3ee7cbf..b2fd9d2 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1


From 84c9bd52d3c2e01f1b385a6dd0fc4822a652867b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 26 Mar 2012 13:48:15 -0700
Subject: BulletSim: update BulletSim binaries and configuration fixing a crash
 which happens when there are more than a few hundred physical objects.

---
 bin/OpenSimDefaults.ini   |   3 ++-
 bin/lib32/BulletSim.dll   | Bin 533504 -> 533504 bytes
 bin/lib32/libBulletSim.so | Bin 619149 -> 619145 bytes
 bin/lib64/BulletSim.dll   | Bin 685056 -> 686080 bytes
 bin/lib64/libBulletSim.so | Bin 688874 -> 688866 bytes
 5 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 41be415..28c5587 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -864,8 +864,9 @@
     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 = True;
+    ShouldDisableContactPoolDynamicAllocation = False;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 357f26e..5bef6e9 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 948d8e3..9882f5b 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index db8530c..9f09ef8 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index b2fd9d2..fa47bf1 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1