* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs

6 files changed, 6 insertions, 29 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6ebdb96..7bdfd1c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,21 +1,6 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
-[XMLRPC]
-    ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
-    ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
-    ;; "xmlrpc_uri(string)" to the script concurrently with the first 
-    ;; remote_data event. This will contain the fully qualified URI an 
-    ;; external site needs to use to send XMLRPC requests to that script
-    ;;   
-    ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
-    ;; will be registered with an external service via a configured uri
-    XmlRpcRouterModule = "XmlRpcRouterModule"
-
-    ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
-    XmlRpcPort = 20800
-
-
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
@@ -931,13 +916,9 @@
 
     ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
     ;  you will want to switch to the heightfield option
-
     TerrainImplementation = 1
     ; TerrainImplementation = 0
 
-    DefaultFriction = 0.20
-    DefaultDensity = 10.000006836
-    DefaultRestitution = 0.0
     Gravity = -9.80665
 
     TerrainFriction = 0.30
@@ -946,7 +927,7 @@
     TerrainCollisionMargin = 0.04
 
     AvatarFriction = 0.2
-    AvatarStandingFriction = 10.0
+    AvatarStandingFriction = 0.95
     AvatarRestitution = 0.0
     AvatarDensity = 3.5
     AvatarCapsuleWidth = 0.6
@@ -958,7 +939,7 @@
 
     CollisionMargin = 0.04
 
-    ; Linkset constraint parameters
+    ; Linkset implmentation
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
     ; Whether to mesh sculpties
@@ -967,14 +948,6 @@
     ; If 'true', force simple prims (box and sphere) to be meshed
     ForceSimplePrimMeshing = false
 
-    ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail
-    MeshLevelOfDetail = 8
-    ; if mesh size is > threshold meters, we need to add more detail because people will notice
-    MeshLevelOfDetailMegaPrimThreshold = 10
-    MeshLevelOfDetailMegaPrim = 16
-    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
-    SculptLevelOfDetail = 32
-
     ; Bullet step parameters
     MaxSubSteps = 10
     FixedTimeStep = .01667
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
index f5282a7..ab3a62a 100644
--- a/bin/Regions/Regions.ini.example
+++ b/bin/Regions/Regions.ini.example
@@ -45,4 +45,8 @@ ExternalHostName = "SYSTEMIP"
 ; *
 
 ; RegionType = "Mainland"
+
+; *
+; * UUID of texture to use as a maptile for this region.
+; * Only set if you have disabled dynamic generation of the map tile from the region contents.
 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 24dffac..de4f95a 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 7e3ed20..674a08a 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 808f433..1c55b19 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 9382751..e2fc8bd 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so