Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

OpenSim/Region/Physics/Manager/PhysicsScene.cs

@@ -88,23 +88,9 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract void RemovePrim(PhysicsActor prim);
 
-        //public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
-        //                                          Vector3 size, Quaternion rotation); //To be removed - Actually removed!
-
         public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
 
-        public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position,
-                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
-        {
-            PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
-
-            if (ret != null)
-                ret.LocalID = localID;
-
-            return ret;
-        }
-
         public virtual float TimeDilation
         {
             get { return 1.0f; }

bin/OpenSim.ini.example

@@ -68,15 +68,6 @@
     ;; in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
-    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} false
-    ;; Use terrain texture for maptiles if true, use shaded green if false
-    ; TextureOnMapTile = false
-
-    ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
-    ;; Draw objects on maptile.  This step might take a long time if you've
-    ;; got a large number of objects, so you can turn it off here if you'd like.
-    ; DrawPrimOnMapTile = true
-
     ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
     ;; Maximum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     ; NonPhysicalPrimMax = 256
@@ -190,7 +181,7 @@
     ;; Map tile options. You can choose to generate no map tiles at all,
     ;; generate normal maptiles, or nominate an uploaded texture to
     ;; be the map tile
-    ; GenerateMaptiles = "true"
+    ; GenerateMaptiles = true
 
     ;; If desired, a running region can update the map tiles periodically
     ;; to reflect building activity. This names no sense of you don't have
@@ -200,6 +191,15 @@
     ;; If not generating maptiles, use this static texture asset ID
     ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
 
+    ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
+    ;; Use terrain texture for maptiles if true, use shaded green if false
+    ; TextureOnMapTile = true
+
+    ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
+    ;; Draw objects on maptile.  This step might take a long time if you've
+    ;; got a large number of objects, so you can turn it off here if you'd like.
+    ; DrawPrimOnMapTile = true
+
     ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
     ; HttpProxy = "http://proxy.com:8080"
 
@@ -218,7 +218,7 @@
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.
 
-    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true
+    ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
     ;; Enable sending email via SMTP
     ; enabled = false
 

bin/OpenSimDefaults.ini

@@ -67,12 +67,6 @@
     ; except that everything is also enclosed in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
-    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
-    ; objects, so you can turn it off here if you'd like.
-    DrawPrimOnMapTile = true
-    ; Use terrain texture for maptiles if true, use shaded green if false
-    TextureOnMapTile = false
-
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
@@ -216,13 +210,23 @@
 
     ;WorldMapModule = "WorldMap"
     ;MapImageModule = "MapImageModule"
+
     ; Set to false to not generate any maptiles
-    ;GenerateMaptiles = "true"
+    ;GenerateMaptiles = true
+
     ; Refresh (in seconds) the map tile periodically
     ;MaptileRefresh = 0
+
     ; If not generating maptiles, use this static texture asset ID
     ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
 
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
+    ; objects, so you can turn it off here if you'd like.
+    DrawPrimOnMapTile = true
+
+    ; Use terrain texture for maptiles if true, use shaded green if false
+    TextureOnMapTile = true
+
     ; ##
     ; ## EMAIL MODULE
     ; ##
@@ -273,15 +277,15 @@
 
 
 [SMTP]
-    enabled=false
+    enabled = false
 
-    ;enabled=true
+    ;enabled = true
-    ;internal_object_host=lsl.opensim.local
+    ;internal_object_host = lsl.opensim.local
-    ;host_domain_header_from=127.0.0.1
+    ;host_domain_header_from = 127.0.0.1
-    ;SMTP_SERVER_HOSTNAME=127.0.0.1
+    ;SMTP_SERVER_HOSTNAME = 127.0.0.1
-    ;SMTP_SERVER_PORT=25
+    ;SMTP_SERVER_PORT = 25
-    ;SMTP_SERVER_LOGIN=foo
+    ;SMTP_SERVER_LOGIN = foo
-    ;SMTP_SERVER_PASSWORD=bar
+    ;SMTP_SERVER_PASSWORD = bar
 
 
 [Network]