aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-06-29 06:37:39 -0700
committerDiva Canto2010-06-29 06:37:39 -0700
commit1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch)
tree09f953b9b6150ea29153917b2c159fa621a1cf66 /bin
parentdon't report the null uuid as a missing asset on saving oars/iars (diff)
parentThis file wants to be committed. (diff)
downloadopensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip
opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz
opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2
opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz
Merge branch 'master' into 0.7-post-fixes
Conflicts: OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example17
-rw-r--r--bin/Robust.32BitLaunch.exebin5632 -> 5632 bytes
-rw-r--r--bin/Robust.HG.ini.example4
-rw-r--r--bin/config-include/StandaloneCommon.ini.example5
4 files changed, 22 insertions, 4 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index aab1a58..f4d9a18 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -597,21 +597,19 @@
597 ; Set this to a nonzero value to have remote admin use a different port 597 ; Set this to a nonzero value to have remote admin use a different port
598 port = 0 598 port = 0
599 599
600 ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
600 access_password = unknown 601 access_password = unknown
601 602
602 ; set this variable to true if you want the create_region XmlRpc 603 ; set this variable to true if you want the create_region XmlRpc
603 ; call to unconditionally enable voice on all parcels for a newly 604 ; call to unconditionally enable voice on all parcels for a newly
604 ; created region [default: false] 605 ; created region [default: false]
605
606 create_region_enable_voice = false 606 create_region_enable_voice = false
607 607
608 ; set this variable to false if you want the create_region XmlRpc 608 ; set this variable to false if you want the create_region XmlRpc
609 ; call to create all regions as private per default (can be 609 ; call to create all regions as private per default (can be
610 ; overridden in the XmlRpc call) [default: true] 610 ; overridden in the XmlRpc call) [default: true]
611
612 create_region_public = false 611 create_region_public = false
613 612
614
615 ; the create_region XmlRpc call uses region_file_template to generate 613 ; the create_region XmlRpc call uses region_file_template to generate
616 ; the file name of newly create regions (if they are created 614 ; the file name of newly create regions (if they are created
617 ; persistent). the parameter available are: 615 ; persistent). the parameter available are:
@@ -620,7 +618,6 @@
620 ; {2} - region UUID 618 ; {2} - region UUID
621 ; {3} - region port 619 ; {3} - region port
622 ; {4} - region name with " ", ":", "/" mapped to "_" 620 ; {4} - region name with " ", ":", "/" mapped to "_"
623
624 region_file_template = "{0}x{1}-{2}.xml" 621 region_file_template = "{0}x{1}-{2}.xml"
625 622
626 ; we can limit the number of regions that XmlRpcCreateRegion will 623 ; we can limit the number of regions that XmlRpcCreateRegion will
@@ -635,6 +632,18 @@
635 ; if this parameter is not specified but enabled = true, all methods will be available 632 ; if this parameter is not specified but enabled = true, all methods will be available
636 enabled_methods = all 633 enabled_methods = all
637 634
635 ; specify the default appearance for an avatar created through the remote admin interface
636 ; This will only take effect is the file specified by the default_appearance setting below exists
637 ;default_male = Default Male
638 ;default_female = Default Female
639
640 ; update appearance copies inventory items and wearables of default avatars. if this value is false
641 ; (default), just worn assets are copied to the Clothes folder; if true, all Clothes and Bodyparts
642 ; subfolders are copied. the receiver will wear the same items the default avatar did wear.
643 ;copy_folders = false
644
645 ; path to default appearance XML file that specifies the look of the default avatars
646 ;default_appearance = default_appearance.xml
638 647
639[RestPlugins] 648[RestPlugins]
640 ; Change this to true to enable REST Plugins. This must be true if you wish to use 649 ; Change this to true to enable REST Plugins. This must be true if you wish to use
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 14a6db3..747d02f 100644
--- a/bin/Robust.32BitLaunch.exe
+++ b/bin/Robust.32BitLaunch.exe
Binary files differ
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 39228eb..6b0029f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -198,6 +198,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
198 ; CHANGE THIS 198 ; CHANGE THIS
199 ExternalName = "http://127.0.0.1:8002" 199 ExternalName = "http://127.0.0.1:8002"
200 200
201 ; Does this grid allow incoming links to any region in it?
202 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
203 AllowTeleportsToAnyRegion = true
204
201[UserAgentService] 205[UserAgentService]
202 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 206 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
203 ;; for the service 207 ;; for the service
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bfa6725..de8677f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -68,3 +68,8 @@
68 68
69[GatekeeperService] 69[GatekeeperService]
70 ExternalName = "http://127.0.0.1:9000" 70 ExternalName = "http://127.0.0.1:9000"
71
72 ; Does this grid allow incoming links to any region in it?
73 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
74 AllowTeleportsToAnyRegion = true
75