diff options
author | Jeff Ames | 2010-10-04 17:10:07 -0400 |
---|---|---|
committer | Jeff Ames | 2010-10-04 17:10:07 -0400 |
commit | eeca0ee0093bd29cbf9c7c845cb9a380f8320491 (patch) | |
tree | 2c2b70c872d9851f57637ad70a30462b96a354c6 /bin | |
parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
download | opensim-SC_OLD-eeca0ee0093bd29cbf9c7c845cb9a380f8320491.zip opensim-SC_OLD-eeca0ee0093bd29cbf9c7c845cb9a380f8320491.tar.gz opensim-SC_OLD-eeca0ee0093bd29cbf9c7c845cb9a380f8320491.tar.bz2 opensim-SC_OLD-eeca0ee0093bd29cbf9c7c845cb9a380f8320491.tar.xz |
Formatting cleanup.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 14 | ||||
-rw-r--r-- | bin/config-include/CenomeCache.ini.example | 6 | ||||
-rw-r--r-- | bin/config-include/FlotsamCache.ini.example | 22 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 12 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 17 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 24 |
6 files changed, 47 insertions, 48 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2b78014..1625de0 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -364,7 +364,7 @@ | |||
364 | 364 | ||
365 | ;; Path to default appearance XML file that specifies the look of the | 365 | ;; Path to default appearance XML file that specifies the look of the |
366 | ;; default avatars | 366 | ;; default avatars |
367 | ; default_appearance = default_appearance.xml | 367 | ; default_appearance = default_appearance.xml |
368 | 368 | ||
369 | [Wind] | 369 | [Wind] |
370 | ;# {enabled} {} {Enable wind module?} {true false} true | 370 | ;# {enabled} {} {Enable wind module?} {true false} true |
@@ -510,7 +510,7 @@ | |||
510 | ;# {AllowOSFunctions} {Enabled:true} {Allow OSFunctions? (DANGEROUS!)} {true false} false | 510 | ;# {AllowOSFunctions} {Enabled:true} {Allow OSFunctions? (DANGEROUS!)} {true false} false |
511 | ;; Allow the use of os* functions (some are dangerous) | 511 | ;; Allow the use of os* functions (some are dangerous) |
512 | ; AllowOSFunctions = false | 512 | ; AllowOSFunctions = false |
513 | 513 | ||
514 | ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true | 514 | ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true |
515 | ; Allow the user of LightShare functions | 515 | ; Allow the user of LightShare functions |
516 | ; AllowLightShareFunctions = false | 516 | ; AllowLightShareFunctions = false |
@@ -633,7 +633,7 @@ | |||
633 | 633 | ||
634 | ;; Service connectors to the Groups Service. Select one depending on | 634 | ;; Service connectors to the Groups Service. Select one depending on |
635 | ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend | 635 | ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend |
636 | 636 | ||
637 | ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector | 637 | ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector |
638 | ;; The service connector to use for the GroupsModule | 638 | ;; The service connector to use for the GroupsModule |
639 | ; ServicesConnectorModule = SimianGroupsServicesConnector | 639 | ; ServicesConnectorModule = SimianGroupsServicesConnector |
@@ -644,7 +644,7 @@ | |||
644 | 644 | ||
645 | ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true | 645 | ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true |
646 | ;; Enable Group Notices | 646 | ;; Enable Group Notices |
647 | ; NoticesEnabled = true | 647 | ; NoticesEnabled = true |
648 | 648 | ||
649 | ;; This makes the Groups modules very chatty on the console. | 649 | ;; This makes the Groups modules very chatty on the console. |
650 | ; DebugEnabled = false | 650 | ; DebugEnabled = false |
@@ -652,12 +652,12 @@ | |||
652 | ;; Specify which messaging module to use for groups messaging and if it's | 652 | ;; Specify which messaging module to use for groups messaging and if it's |
653 | ;; enabled | 653 | ;; enabled |
654 | ; MessagingModule = GroupsMessagingModule | 654 | ; MessagingModule = GroupsMessagingModule |
655 | ; MessagingEnabled = true | 655 | ; MessagingEnabled = true |
656 | 656 | ||
657 | ;; XmlRpc Security settings. These must match those set on your backend | 657 | ;; XmlRpc Security settings. These must match those set on your backend |
658 | ;; groups service. | 658 | ;; groups service. |
659 | ; XmlRpcServiceReadKey = 1234 | 659 | ; XmlRpcServiceReadKey = 1234 |
660 | ; XmlRpcServiceWriteKey = 1234 | 660 | ; XmlRpcServiceWriteKey = 1234 |
661 | 661 | ||
662 | [InterestManagement] | 662 | [InterestManagement] |
663 | ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness | 663 | ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness |
diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example index c7c901b..8ef4e03 100644 --- a/bin/config-include/CenomeCache.ini.example +++ b/bin/config-include/CenomeCache.ini.example | |||
@@ -2,12 +2,12 @@ | |||
2 | ;; | 2 | ;; |
3 | ;; Options for CenmoeAssetCache | 3 | ;; Options for CenmoeAssetCache |
4 | ;; | 4 | ;; |
5 | 5 | ||
6 | ; 256 MB (default: 134217728) | 6 | ; 256 MB (default: 134217728) |
7 | MaxSize = 268435456 | 7 | MaxSize = 268435456 |
8 | 8 | ||
9 | ; How many assets it is possible to store cache (default: 4096) | 9 | ; How many assets it is possible to store cache (default: 4096) |
10 | MaxCount = 16384 | 10 | MaxCount = 16384 |
11 | 11 | ||
12 | ; Expiration time - 1 hour (default: 30 minutes) | 12 | ; Expiration time - 1 hour (default: 30 minutes) |
13 | ExpirationTime = 60 | 13 | ExpirationTime = 60 |
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example index b50d7ec..026dee7 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/bin/config-include/FlotsamCache.ini.example | |||
@@ -2,7 +2,7 @@ | |||
2 | ;; | 2 | ;; |
3 | ;; Options for FlotsamAssetCache | 3 | ;; Options for FlotsamAssetCache |
4 | ;; | 4 | ;; |
5 | 5 | ||
6 | ; cache directory can be shared by multiple instances | 6 | ; cache directory can be shared by multiple instances |
7 | CacheDirectory = ./assetcache | 7 | CacheDirectory = ./assetcache |
8 | ; Other examples: | 8 | ; Other examples: |
@@ -34,9 +34,9 @@ | |||
34 | ; How often {in hours} should the disk be checked for expired filed | 34 | ; How often {in hours} should the disk be checked for expired filed |
35 | ; Specify 0 to disable expiration checking | 35 | ; Specify 0 to disable expiration checking |
36 | FileCleanupTimer = .166 ;roughly every 10 minutes | 36 | FileCleanupTimer = .166 ;roughly every 10 minutes |
37 | 37 | ||
38 | ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how | 38 | ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how |
39 | ; long (in miliseconds) to block a request thread while trying to complete | 39 | ; long (in miliseconds) to block a request thread while trying to complete |
40 | ; an existing write to disk. | 40 | ; an existing write to disk. |
41 | ; WaitOnInprogressTimeout = 3000 | 41 | ; WaitOnInprogressTimeout = 3000 |
42 | 42 | ||
@@ -50,10 +50,10 @@ | |||
50 | 50 | ||
51 | ; Warning level for cache directory size | 51 | ; Warning level for cache directory size |
52 | ;CacheWarnAt = 30000 | 52 | ;CacheWarnAt = 30000 |
53 | 53 | ||
54 | ; Perform a deep scan of all assets within all regions, looking for all assets | 54 | ; Perform a deep scan of all assets within all regions, looking for all assets |
55 | ; present or referenced. Mark all assets found that are already present in the | 55 | ; present or referenced. Mark all assets found that are already present in the |
56 | ; cache, and request all assets that are found that are not already cached (this | 56 | ; cache, and request all assets that are found that are not already cached (this |
57 | ; will cause those assets to be cached) | 57 | ; will cause those assets to be cached) |
58 | ; | 58 | ; |
59 | ; DeepScanBeforePurge = false | 59 | ; DeepScanBeforePurge = false |
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 3ab11b8..cb771b8 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -11,8 +11,8 @@ | |||
11 | ; for more details | 11 | ; for more details |
12 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; | 12 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; |
13 | 13 | ||
14 | ; MySql | 14 | ; MySql |
15 | ; Uncomment these lines if you want to use mysql storage | 15 | ; Uncomment these lines if you want to use mysql storage |
16 | ; Change the connection string to your db details | 16 | ; Change the connection string to your db details |
17 | ;StorageProvider = "OpenSim.Data.MySQL.dll" | 17 | ;StorageProvider = "OpenSim.Data.MySQL.dll" |
18 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" | 18 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" |
@@ -81,18 +81,18 @@ | |||
81 | [Modules] | 81 | [Modules] |
82 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 82 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |
83 | ;; Copy the config .example file into your own .ini file and change configs there | 83 | ;; Copy the config .example file into your own .ini file and change configs there |
84 | 84 | ||
85 | AssetCaching = "FlotsamAssetCache" | 85 | AssetCaching = "FlotsamAssetCache" |
86 | Include-FlotsamCache = "config-include/FlotsamCache.ini" | 86 | Include-FlotsamCache = "config-include/FlotsamCache.ini" |
87 | 87 | ||
88 | ;AssetCaching = "CenomeMemoryAssetCache" | 88 | ;AssetCaching = "CenomeMemoryAssetCache" |
89 | ;Include-CenomeCache = "config-include/CenomeCache.ini" | 89 | ;Include-CenomeCache = "config-include/CenomeCache.ini" |
90 | 90 | ||
91 | ;AssetCaching = "GlynnTuckerAssetCache" | 91 | ;AssetCaching = "GlynnTuckerAssetCache" |
92 | 92 | ||
93 | ;; Optionally, the port for the LLProxyLoginModule module can be changed | 93 | ;; Optionally, the port for the LLProxyLoginModule module can be changed |
94 | 94 | ||
95 | ;Setup_LLProxyLoginModule = "9090/" | 95 | ;Setup_LLProxyLoginModule = "9090/" |
96 | 96 | ||
97 | ;; Authorization is not on by default, as it depends on external php | 97 | ;; Authorization is not on by default, as it depends on external php |
98 | ;AuthorizationServices = "RemoteAuthorizationServicesConnector" | 98 | ;AuthorizationServices = "RemoteAuthorizationServicesConnector" |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index d74b50e..6355d09 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -17,10 +17,10 @@ | |||
17 | AvatarServices = "LocalAvatarServicesConnector" | 17 | AvatarServices = "LocalAvatarServicesConnector" |
18 | EntityTransferModule = "BasicEntityTransferModule" | 18 | EntityTransferModule = "BasicEntityTransferModule" |
19 | InventoryAccessModule = "BasicInventoryAccessModule" | 19 | InventoryAccessModule = "BasicInventoryAccessModule" |
20 | 20 | ||
21 | LibraryModule = true | 21 | LibraryModule = true |
22 | LLLoginServiceInConnector = true | 22 | LLLoginServiceInConnector = true |
23 | GridInfoServiceInConnector = true | 23 | GridInfoServiceInConnector = true |
24 | 24 | ||
25 | [SimulationDataStore] | 25 | [SimulationDataStore] |
26 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 26 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
@@ -35,9 +35,9 @@ | |||
35 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | 35 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" |
36 | 36 | ||
37 | [LibraryService] | 37 | [LibraryService] |
38 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 38 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
39 | LibraryName = "OpenSim Library" | 39 | LibraryName = "OpenSim Library" |
40 | DefaultLibrary = "./inventory/Libraries.xml" | 40 | DefaultLibrary = "./inventory/Libraries.xml" |
41 | 41 | ||
42 | [AvatarService] | 42 | [AvatarService] |
43 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 43 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
@@ -78,7 +78,7 @@ | |||
78 | [LoginService] | 78 | [LoginService] |
79 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" | 79 | LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" |
80 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 80 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
81 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" | 81 | GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" |
82 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 82 | AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
83 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" | 83 | InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" |
84 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | 84 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" |
@@ -88,7 +88,6 @@ | |||
88 | 88 | ||
89 | WelcomeMessage = "Welcome, Avatar!" | 89 | WelcomeMessage = "Welcome, Avatar!" |
90 | 90 | ||
91 | |||
92 | ;; This should always be the very last thing on this file | 91 | ;; This should always be the very last thing on this file |
93 | [Includes] | 92 | [Includes] |
94 | Include-Common = "config-include/StandaloneCommon.ini" | 93 | Include-Common = "config-include/StandaloneCommon.ini" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index a810393..2f021d5 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -13,8 +13,8 @@ | |||
13 | ; for more details | 13 | ; for more details |
14 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; | 14 | ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini"; |
15 | 15 | ||
16 | ; MySql | 16 | ; MySql |
17 | ; Uncomment these lines if you want to use mysql storage | 17 | ; Uncomment these lines if you want to use mysql storage |
18 | ; Change the connection string to your db details | 18 | ; Change the connection string to your db details |
19 | ;StorageProvider = "OpenSim.Data.MySQL.dll" | 19 | ;StorageProvider = "OpenSim.Data.MySQL.dll" |
20 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" | 20 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" |
@@ -28,9 +28,9 @@ | |||
28 | [Modules] | 28 | [Modules] |
29 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 29 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |
30 | ;; Copy the config .example file into your own .ini file and change configs there | 30 | ;; Copy the config .example file into your own .ini file and change configs there |
31 | 31 | ||
32 | ;AssetCaching = "GlynnTuckerAssetCache" | 32 | ;AssetCaching = "GlynnTuckerAssetCache" |
33 | 33 | ||
34 | ;AssetCaching = "FlotsamAssetCache" | 34 | ;AssetCaching = "FlotsamAssetCache" |
35 | ;Include-FlotsamCache = "config-include/FlotsamCache.ini" | 35 | ;Include-FlotsamCache = "config-include/FlotsamCache.ini" |
36 | 36 | ||
@@ -41,7 +41,7 @@ | |||
41 | ;FreeswitchServiceInConnector = True | 41 | ;FreeswitchServiceInConnector = True |
42 | 42 | ||
43 | ;; Authorization is not on by default, as it depends on external php | 43 | ;; Authorization is not on by default, as it depends on external php |
44 | ;AuthorizationServices = "LocalAuthorizationServicesConnector" | 44 | ;AuthorizationServices = "LocalAuthorizationServicesConnector" |
45 | 45 | ||
46 | [FreeswitchService] | 46 | [FreeswitchService] |
47 | ;; Configuration for the freeswitch service goes here | 47 | ;; Configuration for the freeswitch service goes here |
@@ -49,11 +49,11 @@ | |||
49 | 49 | ||
50 | [GridService] | 50 | [GridService] |
51 | ;; For in-memory region storage (default) | 51 | ;; For in-memory region storage (default) |
52 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 52 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
53 | ;;--- For MySql region storage (alternative) | 53 | ;;--- For MySql region storage (alternative) |
54 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | 54 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" |
55 | 55 | ||
56 | ; If HG, do you want this check on the distance to be performed? | 56 | ; If HG, do you want this check on the distance to be performed? |
57 | ; Check4096 = "False" | 57 | ; Check4096 = "False" |
58 | 58 | ||
59 | ;; Next, we can specify properties of regions, including default and fallback regions | 59 | ;; Next, we can specify properties of regions, including default and fallback regions |
@@ -65,7 +65,7 @@ | |||
65 | [LibraryModule] | 65 | [LibraryModule] |
66 | ; Set this if you want to change the name of the OpenSim Library | 66 | ; Set this if you want to change the name of the OpenSim Library |
67 | ;LibraryName = "My World's Library" | 67 | ;LibraryName = "My World's Library" |
68 | 68 | ||
69 | [LoginService] | 69 | [LoginService] |
70 | WelcomeMessage = "Welcome, Avatar!" | 70 | WelcomeMessage = "Welcome, Avatar!" |
71 | 71 | ||
@@ -77,9 +77,9 @@ | |||
77 | [GatekeeperService] | 77 | [GatekeeperService] |
78 | ExternalName = "http://127.0.0.1:9000" | 78 | ExternalName = "http://127.0.0.1:9000" |
79 | 79 | ||
80 | ; Does this grid allow incoming links to any region in it? | 80 | ; Does this grid allow incoming links to any region in it? |
81 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section | 81 | ; If false, HG TPs happen only to the Default regions specified in [GridService] section |
82 | AllowTeleportsToAnyRegion = true | 82 | AllowTeleportsToAnyRegion = true |
83 | 83 | ||
84 | [GridInfoService] | 84 | [GridInfoService] |
85 | ; These settings are used to return information on a get_grid_info call. | 85 | ; These settings are used to return information on a get_grid_info call. |