From 3270bd560e29fcc871cab6e99a504903eef7af0e Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Wed, 20 Jul 2011 14:34:02 -0700 Subject: Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts --- OpenSim/Region/Physics/Manager/PhysicsScene.cs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 28ace34..3870411 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/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; } -- cgit v1.1 From 1c758ae01c514df4742a9cdae6480e8011debf38 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:08:58 +0100 Subject: make default TextureOnMapTile true for the older map imager Don't know of a good reason not to do this, seems to work fine. --- bin/OpenSim.ini.example | 4 ++-- bin/OpenSimDefaults.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 60d37fb..b706926 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -68,9 +68,9 @@ ;; in a tag. ; regionload_webserver_url = "http://example.com/regions.xml"; - ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} false + ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true ;; Use terrain texture for maptiles if true, use shaded green if false - ; TextureOnMapTile = 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 diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 400d3df..ffb3063 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -71,7 +71,7 @@ ; 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 + TextureOnMapTile = true ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). NonPhysicalPrimMax = 256 -- cgit v1.1 From 69c2d3434a314b962deda9557b280718c22bab9c Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:13:54 +0100 Subject: minor: remove the pointless quotes from the GenerateMaptiles option --- bin/OpenSim.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index b706926..b21e3e2 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -190,7 +190,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 -- cgit v1.1 From d2d67a1abfe88e1f86e7edce279905602b8192cb Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:14:43 +0100 Subject: remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini --- bin/OpenSimDefaults.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ffb3063..b6b4d6b 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -216,10 +216,13 @@ ;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" -- cgit v1.1 From 0a09c45726a0115b34c34ecbfa5bf48dff501590 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:18:10 +0100 Subject: minor: group all the map tile options together --- bin/OpenSim.ini.example | 18 +++++++++--------- bin/OpenSimDefaults.ini | 13 +++++++------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index b21e3e2..acad0f3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -68,15 +68,6 @@ ;; in a tag. ; regionload_webserver_url = "http://example.com/regions.xml"; - ;# {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 - ;# {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 @@ -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" diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index b6b4d6b..d1b3ae6 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -67,12 +67,6 @@ ; except that everything is also enclosed in a 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 = true - ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). NonPhysicalPrimMax = 256 @@ -226,6 +220,13 @@ ; 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 ; ## -- cgit v1.1 From e1ce1067902614df732422721b8806e978a36f5f Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:21:19 +0100 Subject: make [SMTP] default comment option match actual default --- bin/OpenSim.ini.example | 2 +- bin/OpenSimDefaults.ini | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index acad0f3..2fe4db7 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -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 diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d1b3ae6..bf36228 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -277,15 +277,15 @@ [SMTP] - enabled=false - - ;enabled=true - ;internal_object_host=lsl.opensim.local - ;host_domain_header_from=127.0.0.1 - ;SMTP_SERVER_HOSTNAME=127.0.0.1 - ;SMTP_SERVER_PORT=25 - ;SMTP_SERVER_LOGIN=foo - ;SMTP_SERVER_PASSWORD=bar + enabled = false + + ;enabled = true + ;internal_object_host = lsl.opensim.local + ;host_domain_header_from = 127.0.0.1 + ;SMTP_SERVER_HOSTNAME = 127.0.0.1 + ;SMTP_SERVER_PORT = 25 + ;SMTP_SERVER_LOGIN = foo + ;SMTP_SERVER_PASSWORD = bar [Network] -- cgit v1.1 From 630e11cbe1001d858a5af9aee0047f4a99af3b98 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:22:27 +0100 Subject: remove dead MXP default symbols. The MXP code is long, long gone. --- bin/MXP.pdb | Bin 382464 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/MXP.pdb diff --git a/bin/MXP.pdb b/bin/MXP.pdb deleted file mode 100644 index deadeef..0000000 Binary files a/bin/MXP.pdb and /dev/null differ -- cgit v1.1 From 6426492da04b48561a658382e8eba40c92cf4dd9 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:24:20 +0100 Subject: remove the windows debugging symbols for the long protobuf-net --- bin/protobuf-net.pdb | Bin 331264 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/protobuf-net.pdb diff --git a/bin/protobuf-net.pdb b/bin/protobuf-net.pdb deleted file mode 100644 index 9c85bdc..0000000 Binary files a/bin/protobuf-net.pdb and /dev/null differ -- cgit v1.1