2 files changed, 0 insertions, 517 deletions
diff --git a/config/config-include/GridCommon.ini b/config/config-include/GridCommon.ini
deleted file mode 100644
index 1281aee..0000000
--- a/config/config-include/GridCommon.ini
+++ /dev/null
@@ -1,272 +0,0 @@
-; This is the main configuration file for an instance of OpenSim running in grid mode
-; In particular, this one is set up for connecting to Infinite Grid.
-[DatabaseService]
-    ;
-    ; ### Choose the DB
-    ;
-    ; SQLite
-    ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
-    ; MySql
-    ; Uncomment these lines if you want to use mysql storage
-    ; Change the connection string to your db details
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
-    ; Uncomment this line if you are using MySQL and want to use a different database for estates
-    ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
-    ; Most people won't need to do this so only uncomment if you know what you're doing.
-    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
-    ; MSSQL
-    ; Uncomment these lines if you want to use MSSQL storage
-    ; Change the connection string to your db details
-    ; The value for server property is shown in your SQL Server Management Studio login dialog.
-    ; (This sample is the default of express edition)
-    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
-    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
-    ; PGSQL
-    ; Uncomment these lines if you want to use PGSQL storage
-    ; Change the connection string to your db details
-    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
-    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
-    StorageProvider = "${Const|DataProvider}"
-    ConnectionString = "${Const|ConnectionString}"
-[Hypergrid]
-    ; Uncomment the variables in this section only if you are in
-    ; Hypergrid configuration. Otherwise, ignore.
-    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-    ;; If this is a standalone world, this is the address of this instance.
-    ;; If this is a grided simulator, this is the address of the external robust server that
-    ;; runs the UserAgentsService.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
-    ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
-    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-    ;; If this is a standalone world, this is the address of this instance.
-    ;; If this is a grided simulator, this is the address of the external robust server
-    ;; that runs the Gatekeeper service.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
-    ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
-[Modules]
-    ;; Choose one cache module and the corresponding config file, if it exists.
-    ;; Copy the config .example file into your own .ini file and adapt that.
-    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
-    ; I think only Windows needs caching, haven't noticed any difference under Linux, which uses spare memory for file caching anyway.
-    AssetCaching = "FlotsamAssetCache"
-    Include-FlotsamCache = "config-include/FlotsamCache.ini"
-    ;AssetCaching = "CenomeMemoryAssetCache"
-    ;Include-CenomeCache = "config-include/CenomeCache.ini"
-    ;AssetCaching = "GlynnTuckerAssetCache"
-    ;; Optionally, the port for the LLProxyLoginModule module can be changed
-    ;Setup_LLProxyLoginModule = "9090/"
-    ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
-    ;; To allow the Teleport and Show on Map buttons to work properly (for search
-    ;; results containing locations).  From ossearch module.
-;    LandServices = "RemoteLandServicesConnector"
-;    LandServiceInConnector = "true"
-[AssetService]
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-    ;
-    ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
-    ;
-    AssetServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[InventoryService]
-    ;
-    ; Change this to your grid-wide inventory server
-    ;
-    InventoryServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[GridInfo]
-    ;
-    ; Change this to your grid info service
-    ;
-    GridInfoURI = "${Const|GridURL}:${Const|PublicPort}"
-[GridService]
-    ;
-    ; Change this to your grid-wide grid server
-    ;
-    GridServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    AllowHypergridMapSearch = true
-    ;; Directory for map tile images of linked regions
-    MapTileDirectory = "${Const|CachePath}/maptiles"
-    ; === HG ONLY ===
-    ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
-    ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper="${Const|GridURL}:${Const|PublicPort}"
-[EstateDataStore]
-    ;
-    ; Uncomment if you want centralized estate data at robust server,
-    ; in which case the URL in [EstateService] will be used
-    ;
-    ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
-[EstateService]
-    EstateServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-[Messaging]
-    ; === HG ONLY ===
-    ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
-    ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
-[AvatarService]
-    ;
-    ; Change this to your grid-wide grid server
-    ;
-    AvatarServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[AgentPreferencesService]
-    ;
-    ; Change this to your grid-wide avatar prefs server
-    ;
-    AgentPreferencesServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-[PresenceService]
-    ;
-    ; Change this to your grid-wide presence server
-    ;
-    PresenceServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-[UserAccountService]
-    ;
-    ; Change this to your grid-wide user accounts server
-    ;
-    UserAccountServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[GridUserService]
-    ;
-    ; Change this to your grid-wide user accounts server
-    ;
-    GridUserServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[AuthenticationService]
-    ;
-    ; Change this to your grid-wide authentication server
-    ;
-    AuthenticationServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[FriendsService]
-    ;
-    ; Change this to your grid-wide friends server
-    ;
-    FriendsServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-    ConnectionString = "${Const|ConnectionString}"
-[HGInventoryAccessModule]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your server 
-    ; accessible from other grids
-    ;
-    HomeURI = "${Const|GridURL}:${Const|PublicPort}"
-    Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
-    ;; If you want to protect your assets from being copied by foreign visitors
-    ;; set this to false. You may want to do this on sims that have licensed content.
-    ;; Default is true.
-    OutboundPermission = True
-    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
-    ;; and available when they return. True by default.
-    ;RestrictInventoryAccessAbroad = True
-    ;; Warning: advanced and unusual. Default is false.
-    ;; Enables configurations where grids share user services, including inventory,
-    ;; while separating regions' assets from users' assets. Asset transfer between 
-    ;; the users' asset server and the regions' asset server is done in HG-like manner.
-    ; CheckSeparateAssets = false
-    ; RegionHGAssetServerURI = ${Const|GridURL}:${Const|PublicPort}
-[HGAssetService]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your server 
-    ; accessible from other grids
-    ;
-    HomeURI = "${Const|GridURL}:${Const|PublicPort}"
-    ;; The asset types that this grid can export to / import from other grids.
-    ;; Comma separated.
-    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-    ;;
-    ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
-    ;; of scripts, like so:
-    ; DisallowExport ="LSLText"
-    ; DisallowImport ="LSLBytecode"
-[HGFriendsModule]
-    ; User level required to be able to send friendship invitations to foreign users
-    LevelHGFriends = 0;
-[UserAgentService]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your user agent server (HG robust)
-    ;
-    UserAgentServerURI = "${Const|GridURL}:${Const|PublicPort}"
-[MapImageService]
-    MapImageServerURI = "${Const|GridURL}:${Const|PrivatePort}"
-[AuthorizationService]
-  ; If you have regions with access restrictions
-    ; specify them here using the convention
-    ; Region_<Region_Name> = <flags>
-    ; Valid flags are:
-    ; DisallowForeigners -- HG visitors not allowed
-    ; DisallowResidents -- only Admins and Managers allowed
-    ; Example:
-    ; Region_Test_1 = "DisallowForeigners"
-;; Uncomment if you are using SimianGrid for grid services
-[SimianGrid]
-    ;; SimianGrid services URL
-    ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
-    ;; Capability assigned by the grid administrator for the simulator
-    ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
diff --git a/config/config-include/GridCommon.ini.example b/config/config-include/GridCommon.ini.example
deleted file mode 100644
index 0922cf5..0000000
--- a/config/config-include/GridCommon.ini.example
+++ /dev/null
@@ -1,245 +0,0 @@
-; This is the main configuration file for an instance of OpenSim running in grid mode
-[DatabaseService]
-    ;
-    ; ### Choose the DB
-    ;
-    ; SQLite
-    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
-    ; MySql
-    ; Uncomment these lines if you want to use mysql storage
-    ; Change the connection string to your db details
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
-    ; Uncomment this line if you are using MySQL and want to use a different database for estates
-    ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
-    ; Most people won't need to do this so only uncomment if you know what you're doing.
-    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
-    ; MSSQL
-    ; Uncomment these lines if you want to use MSSQL storage
-    ; Change the connection string to your db details
-    ; The value for server property is shown in your SQL Server Management Studio login dialog.
-    ; (This sample is the default of express edition)
-    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
-    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
-    ; PGSQL
-    ; Uncomment these lines if you want to use PGSQL storage
-    ; Change the connection string to your db details
-    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
-    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
-[Hypergrid]
-    ; Uncomment the variables in this section only if you are in
-    ; Hypergrid configuration. Otherwise, ignore.
-    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-    ;; If this is a standalone world, this is the address of this instance.
-    ;; If this is a grided simulator, this is the address of the external robust server that
-    ;; runs the UserAgentsService.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
-    ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
-    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-    ;; If this is a standalone world, this is the address of this instance.
-    ;; If this is a grided simulator, this is the address of the external robust server
-    ;; that runs the Gatekeeper service.
-    ;; For example http://myworld.com:9000 or http://myworld.com:8002
-    ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
-[Modules]
-    ;; Choose one cache module and the corresponding config file, if it exists.
-    ;; Copy the config .example file into your own .ini file and adapt that.
-    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
-    AssetCaching = "FlotsamAssetCache"
-    Include-FlotsamCache = "config-include/FlotsamCache.ini"
-    ;AssetCaching = "CenomeMemoryAssetCache"
-    ;Include-CenomeCache = "config-include/CenomeCache.ini"
-    ;AssetCaching = "GlynnTuckerAssetCache"
-    ;; Optionally, the port for the LLProxyLoginModule module can be changed
-    ;Setup_LLProxyLoginModule = "9090/"
-    ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
-[AssetService]
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-    ;
-    ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
-    ;
-    AssetServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[InventoryService]
-    ;
-    ; Change this to your grid-wide inventory server
-    ;
-    InventoryServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[GridInfo]
-    ;
-    ; Change this to your grid info service
-    ;
-    GridInfoURI = "${Const|BaseURL}:${Const|PublicPort}"
-[GridService]
-    ;
-    ; Change this to your grid-wide grid server
-    ;
-    GridServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-    ;AllowHypergridMapSearch = true
-    ;; Directory for map tile images of linked regions
-    ; MapTileDirectory = "./maptiles"
-    ; === HG ONLY ===
-    ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
-    ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
-[EstateDataStore]
-    ;
-    ; Uncomment if you want centralized estate data at robust server,
-    ; in which case the URL in [EstateService] will be used
-    ;
-    ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
-[EstateService]
-    EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[Messaging]
-    ; === HG ONLY ===
-    ;; Change this to the address of your Gatekeeper service
-    ;; (usually bundled with the rest of the services in one 
-    ;; Robust server in port ${Const|PublicPort}, but not always)
-    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
-[AvatarService]
-    ;
-    ; Change this to your grid-wide grid server
-    ;
-    AvatarServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[AgentPreferencesService]
-    ;
-    ; Change this to your grid-wide avatar prefs server
-    ;
-    AgentPreferencesServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[PresenceService]
-    ;
-    ; Change this to your grid-wide presence server
-    ;
-    PresenceServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[UserAccountService]
-    ;
-    ; Change this to your grid-wide user accounts server
-    ;
-    UserAccountServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[GridUserService]
-    ;
-    ; Change this to your grid-wide user accounts server
-    ;
-    GridUserServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[AuthenticationService]
-    ;
-    ; Change this to your grid-wide authentication server
-    ;
-    AuthenticationServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[FriendsService]
-    ;
-    ; Change this to your grid-wide friends server
-    ;
-    FriendsServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[HGInventoryAccessModule]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your server 
-    ; accessible from other grids
-    ;
-    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
-    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
-    ;; If you want to protect your assets from being copied by foreign visitors
-    ;; set this to false. You may want to do this on sims that have licensed content.
-    ;; Default is true.
-    ; OutboundPermission = True
-    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
-    ;; and available when they return. True by default.
-    ;RestrictInventoryAccessAbroad = True
-    ;; Warning: advanced and unusual. Default is false.
-    ;; Enables configurations where grids share user services, including inventory,
-    ;; while separating regions' assets from users' assets. Asset transfer between 
-    ;; the users' asset server and the regions' asset server is done in HG-like manner.
-    ; CheckSeparateAssets = false
-    ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
-[HGAssetService]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your server 
-    ; accessible from other grids
-    ;
-    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
-    ;; The asset types that this grid can export to / import from other grids.
-    ;; Comma separated.
-    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
-    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
-    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
-    ;;
-    ;; Leave blank or commented if you don't want to apply any restrictions.
-    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
-    ;; of scripts, like so:
-    ; DisallowExport ="LSLText"
-    ; DisallowImport ="LSLBytecode"
-[HGFriendsModule]
-    ; User level required to be able to send friendship invitations to foreign users
-    ;LevelHGFriends = 0;
-[UserAgentService]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your user agent server (HG robust)
-    ;
-    UserAgentServerURI = "${Const|BaseURL}:${Const|PublicPort}"
-[MapImageService]
-    MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
-[AuthorizationService]
-  ; If you have regions with access restrictions
-    ; specify them here using the convention
-    ; Region_<Region_Name> = <flags>
-    ; Valid flags are:
-    ; DisallowForeigners -- HG visitors not allowed
-    ; DisallowResidents -- only Admins and Managers allowed
-    ; Example:
-    ; Region_Test_1 = "DisallowForeigners"
-;; Uncomment if you are using SimianGrid for grid services
-[SimianGrid]
-    ;; SimianGrid services URL
-    ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
-    ;; Capability assigned by the grid administrator for the simulator
-    ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"

diff --git a/config/config-include/GridCommon.ini b/config/config-include/GridCommon.ini deleted file mode 100644 index 1281aee..0000000 --- a/config/config-include/GridCommon.ini +++ /dev/null
@@ -1,272 +0,0 @@
1	; This is the main configuration file for an instance of OpenSim running in grid mode
2	; In particular, this one is set up for connecting to Infinite Grid.
3
4	[DatabaseService]
5	;
6	; ### Choose the DB
7	;
8
9	; SQLite
10	; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
11
12	; MySql
13	; Uncomment these lines if you want to use mysql storage
14	; Change the connection string to your db details
15	;StorageProvider = "OpenSim.Data.MySQL.dll"
16	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
17	; Uncomment this line if you are using MySQL and want to use a different database for estates
18	; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
19	; Most people won't need to do this so only uncomment if you know what you're doing.
20	;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
21
22	; MSSQL
23	; Uncomment these lines if you want to use MSSQL storage
24	; Change the connection string to your db details
25	; The value for server property is shown in your SQL Server Management Studio login dialog.
26	; (This sample is the default of express edition)
27	;StorageProvider = "OpenSim.Data.MSSQL.dll"
28	;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
29
30	; PGSQL
31	; Uncomment these lines if you want to use PGSQL storage
32	; Change the connection string to your db details
33	;StorageProvider = "OpenSim.Data.PGSQL.dll"
34	;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
35
36	StorageProvider = "${Const\|DataProvider}"
37	ConnectionString = "${Const\|ConnectionString}"
38
39
40	[Hypergrid]
41	; Uncomment the variables in this section only if you are in
42	; Hypergrid configuration. Otherwise, ignore.
43
44	;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
45	;; If this is a standalone world, this is the address of this instance.
46	;; If this is a grided simulator, this is the address of the external robust server that
47	;; runs the UserAgentsService.
48	;; For example http://myworld.com:9000 or http://myworld.com:8002
49	;; This is a default that can be overwritten in some sections.
50	; HomeURI = "${Const\|GridURL}:${Const\|PublicPort}"
51
52	;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
53	;; If this is a standalone world, this is the address of this instance.
54	;; If this is a grided simulator, this is the address of the external robust server
55	;; that runs the Gatekeeper service.
56	;; For example http://myworld.com:9000 or http://myworld.com:8002
57	;; This is a default that can be overwritten in some sections.
58	; GatekeeperURI = "${Const\|GridURL}:${Const\|PublicPort}"
59
60	[Modules]
61	;; Choose one cache module and the corresponding config file, if it exists.
62	;; Copy the config .example file into your own .ini file and adapt that.
63	;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
64	; I think only Windows needs caching, haven't noticed any difference under Linux, which uses spare memory for file caching anyway.
65
66	AssetCaching = "FlotsamAssetCache"
67	Include-FlotsamCache = "config-include/FlotsamCache.ini"
68
69	;AssetCaching = "CenomeMemoryAssetCache"
70	;Include-CenomeCache = "config-include/CenomeCache.ini"
71
72	;AssetCaching = "GlynnTuckerAssetCache"
73
74	;; Optionally, the port for the LLProxyLoginModule module can be changed
75	;Setup_LLProxyLoginModule = "9090/"
76
77	;; Authorization is not on by default, as it depends on external php
78	;AuthorizationServices = "RemoteAuthorizationServicesConnector"
79
80	;; To allow the Teleport and Show on Map buttons to work properly (for search
81	;; results containing locations). From ossearch module.
82	; LandServices = "RemoteLandServicesConnector"
83	; LandServiceInConnector = "true"
84
85	[AssetService]
86	DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
87	AssetLoaderArgs = "assets/AssetSets.xml"
88
89	;
90	; Change this to your grid-wide asset server. Do not add a slash to the end of any of these addresses.
91	;
92	AssetServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
93
94	ConnectionString = "${Const\|ConnectionString}"
95
96
97	[InventoryService]
98	;
99	; Change this to your grid-wide inventory server
100	;
101	InventoryServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
102
103	ConnectionString = "${Const\|ConnectionString}"
104
105	[GridInfo]
106	;
107	; Change this to your grid info service
108	;
109	GridInfoURI = "${Const\|GridURL}:${Const\|PublicPort}"
110
111	[GridService]
112	;
113	; Change this to your grid-wide grid server
114	;
115	GridServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
116	AllowHypergridMapSearch = true
117
118	;; Directory for map tile images of linked regions
119	MapTileDirectory = "${Const\|CachePath}/maptiles"
120
121	; === HG ONLY ===
122	;; Change this to the address of your Gatekeeper service
123	;; (usually bundled with the rest of the services in one
124	;; Robust server in port ${Const\|PublicPort}, but not always)
125	Gatekeeper="${Const\|GridURL}:${Const\|PublicPort}"
126
127	[EstateDataStore]
128	;
129	; Uncomment if you want centralized estate data at robust server,
130	; in which case the URL in [EstateService] will be used
131	;
132	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
133
134	[EstateService]
135	EstateServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
136
137	[Messaging]
138	; === HG ONLY ===
139	;; Change this to the address of your Gatekeeper service
140	;; (usually bundled with the rest of the services in one
141	;; Robust server in port ${Const\|PublicPort}, but not always)
142	Gatekeeper = "${Const\|GridURL}:${Const\|PublicPort}"
143
144	[AvatarService]
145	;
146	; Change this to your grid-wide grid server
147	;
148	AvatarServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
149
150	ConnectionString = "${Const\|ConnectionString}"
151
152	[AgentPreferencesService]
153	;
154	; Change this to your grid-wide avatar prefs server
155	;
156	AgentPreferencesServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
157
158	[PresenceService]
159	;
160	; Change this to your grid-wide presence server
161	;
162	PresenceServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
163
164	[UserAccountService]
165	;
166	; Change this to your grid-wide user accounts server
167	;
168	UserAccountServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
169
170	ConnectionString = "${Const\|ConnectionString}"
171
172	[GridUserService]
173	;
174	; Change this to your grid-wide user accounts server
175	;
176	GridUserServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
177
178	ConnectionString = "${Const\|ConnectionString}"
179
180	[AuthenticationService]
181	;
182	; Change this to your grid-wide authentication server
183	;
184	AuthenticationServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
185
186	ConnectionString = "${Const\|ConnectionString}"
187
188	[FriendsService]
189	;
190	; Change this to your grid-wide friends server
191	;
192	FriendsServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
193
194	ConnectionString = "${Const\|ConnectionString}"
195
196	[HGInventoryAccessModule]
197	;
198	; === HG ONLY ===
199	; Change this to your server
200	; accessible from other grids
201	;
202	HomeURI = "${Const\|GridURL}:${Const\|PublicPort}"
203	Gatekeeper = "${Const\|GridURL}:${Const\|PublicPort}"
204	;; If you want to protect your assets from being copied by foreign visitors
205	;; set this to false. You may want to do this on sims that have licensed content.
206	;; Default is true.
207	OutboundPermission = True
208
209	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
210	;; and available when they return. True by default.
211	;RestrictInventoryAccessAbroad = True
212
213	;; Warning: advanced and unusual. Default is false.
214	;; Enables configurations where grids share user services, including inventory,
215	;; while separating regions' assets from users' assets. Asset transfer between
216	;; the users' asset server and the regions' asset server is done in HG-like manner.
217	; CheckSeparateAssets = false
218	; RegionHGAssetServerURI = ${Const\|GridURL}:${Const\|PublicPort}
219
220
221	[HGAssetService]
222	;
223	; === HG ONLY ===
224	; Change this to your server
225	; accessible from other grids
226	;
227	HomeURI = "${Const\|GridURL}:${Const\|PublicPort}"
228
229	;; The asset types that this grid can export to / import from other grids.
230	;; Comma separated.
231	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
232	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
233	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
234	;;
235	;; Leave blank or commented if you don't want to apply any restrictions.
236	;; A more strict, but still reasonable, policy may be to disallow the exchange
237	;; of scripts, like so:
238	; DisallowExport ="LSLText"
239	; DisallowImport ="LSLBytecode"
240
241	[HGFriendsModule]
242	; User level required to be able to send friendship invitations to foreign users
243	LevelHGFriends = 0;
244
245	[UserAgentService]
246	;
247	; === HG ONLY ===
248	; Change this to your user agent server (HG robust)
249	;
250	UserAgentServerURI = "${Const\|GridURL}:${Const\|PublicPort}"
251
252	[MapImageService]
253	MapImageServerURI = "${Const\|GridURL}:${Const\|PrivatePort}"
254
255	[AuthorizationService]
256	; If you have regions with access restrictions
257	; specify them here using the convention
258	; Region_<Region_Name> = <flags>
259	; Valid flags are:
260	; DisallowForeigners -- HG visitors not allowed
261	; DisallowResidents -- only Admins and Managers allowed
262	; Example:
263	; Region_Test_1 = "DisallowForeigners"
264
265	;; Uncomment if you are using SimianGrid for grid services
266	[SimianGrid]
267	;; SimianGrid services URL
268	;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
269
270	;; Capability assigned by the grid administrator for the simulator
271	;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
272


diff --git a/config/config-include/GridCommon.ini.example b/config/config-include/GridCommon.ini.example deleted file mode 100644 index 0922cf5..0000000 --- a/config/config-include/GridCommon.ini.example +++ /dev/null
@@ -1,245 +0,0 @@
1	; This is the main configuration file for an instance of OpenSim running in grid mode
2
3	[DatabaseService]
4	;
5	; ### Choose the DB
6	;
7
8	; SQLite
9	Include-Storage = "config-include/storage/SQLiteStandalone.ini";
10
11	; MySql
12	; Uncomment these lines if you want to use mysql storage
13	; Change the connection string to your db details
14	;StorageProvider = "OpenSim.Data.MySQL.dll"
15	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
16	; Uncomment this line if you are using MySQL and want to use a different database for estates
17	; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
18	; Most people won't need to do this so only uncomment if you know what you're doing.
19	;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
20
21	; MSSQL
22	; Uncomment these lines if you want to use MSSQL storage
23	; Change the connection string to your db details
24	; The value for server property is shown in your SQL Server Management Studio login dialog.
25	; (This sample is the default of express edition)
26	;StorageProvider = "OpenSim.Data.MSSQL.dll"
27	;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
28
29	; PGSQL
30	; Uncomment these lines if you want to use PGSQL storage
31	; Change the connection string to your db details
32	;StorageProvider = "OpenSim.Data.PGSQL.dll"
33	;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
34
35	[Hypergrid]
36	; Uncomment the variables in this section only if you are in
37	; Hypergrid configuration. Otherwise, ignore.
38
39	;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
40	;; If this is a standalone world, this is the address of this instance.
41	;; If this is a grided simulator, this is the address of the external robust server that
42	;; runs the UserAgentsService.
43	;; For example http://myworld.com:9000 or http://myworld.com:8002
44	;; This is a default that can be overwritten in some sections.
45	; HomeURI = "${Const\|BaseURL}:${Const\|PublicPort}"
46
47	;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
48	;; If this is a standalone world, this is the address of this instance.
49	;; If this is a grided simulator, this is the address of the external robust server
50	;; that runs the Gatekeeper service.
51	;; For example http://myworld.com:9000 or http://myworld.com:8002
52	;; This is a default that can be overwritten in some sections.
53	; GatekeeperURI = "${Const\|BaseURL}:${Const\|PublicPort}"
54
55	[Modules]
56	;; Choose one cache module and the corresponding config file, if it exists.
57	;; Copy the config .example file into your own .ini file and adapt that.
58	;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
59
60	AssetCaching = "FlotsamAssetCache"
61	Include-FlotsamCache = "config-include/FlotsamCache.ini"
62
63	;AssetCaching = "CenomeMemoryAssetCache"
64	;Include-CenomeCache = "config-include/CenomeCache.ini"
65
66	;AssetCaching = "GlynnTuckerAssetCache"
67
68	;; Optionally, the port for the LLProxyLoginModule module can be changed
69	;Setup_LLProxyLoginModule = "9090/"
70
71	;; Authorization is not on by default, as it depends on external php
72	;AuthorizationServices = "RemoteAuthorizationServicesConnector"
73
74	[AssetService]
75	DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
76	AssetLoaderArgs = "assets/AssetSets.xml"
77
78	;
79	; Change this to your grid-wide asset server. Do not add a slash to the end of any of these addresses.
80	;
81	AssetServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
82
83	[InventoryService]
84	;
85	; Change this to your grid-wide inventory server
86	;
87	InventoryServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
88
89	[GridInfo]
90	;
91	; Change this to your grid info service
92	;
93	GridInfoURI = "${Const\|BaseURL}:${Const\|PublicPort}"
94
95	[GridService]
96	;
97	; Change this to your grid-wide grid server
98	;
99	GridServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
100	;AllowHypergridMapSearch = true
101
102	;; Directory for map tile images of linked regions
103	; MapTileDirectory = "./maptiles"
104
105	; === HG ONLY ===
106	;; Change this to the address of your Gatekeeper service
107	;; (usually bundled with the rest of the services in one
108	;; Robust server in port ${Const\|PublicPort}, but not always)
109	Gatekeeper="${Const\|BaseURL}:${Const\|PublicPort}"
110
111	[EstateDataStore]
112	;
113	; Uncomment if you want centralized estate data at robust server,
114	; in which case the URL in [EstateService] will be used
115	;
116	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
117
118	[EstateService]
119	EstateServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
120
121	[Messaging]
122	; === HG ONLY ===
123	;; Change this to the address of your Gatekeeper service
124	;; (usually bundled with the rest of the services in one
125	;; Robust server in port ${Const\|PublicPort}, but not always)
126	Gatekeeper = "${Const\|BaseURL}:${Const\|PublicPort}"
127
128	[AvatarService]
129	;
130	; Change this to your grid-wide grid server
131	;
132	AvatarServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
133
134	[AgentPreferencesService]
135	;
136	; Change this to your grid-wide avatar prefs server
137	;
138	AgentPreferencesServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
139
140	[PresenceService]
141	;
142	; Change this to your grid-wide presence server
143	;
144	PresenceServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
145
146	[UserAccountService]
147	;
148	; Change this to your grid-wide user accounts server
149	;
150	UserAccountServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
151
152	[GridUserService]
153	;
154	; Change this to your grid-wide user accounts server
155	;
156	GridUserServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
157
158	[AuthenticationService]
159	;
160	; Change this to your grid-wide authentication server
161	;
162	AuthenticationServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
163
164	[FriendsService]
165	;
166	; Change this to your grid-wide friends server
167	;
168	FriendsServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
169
170	[HGInventoryAccessModule]
171	;
172	; === HG ONLY ===
173	; Change this to your server
174	; accessible from other grids
175	;
176	HomeURI = "${Const\|BaseURL}:${Const\|PublicPort}"
177	Gatekeeper = "${Const\|BaseURL}:${Const\|PublicPort}"
178	;; If you want to protect your assets from being copied by foreign visitors
179	;; set this to false. You may want to do this on sims that have licensed content.
180	;; Default is true.
181	; OutboundPermission = True
182
183	;; Send visual reminder to local users that their inventories are unavailable while they are traveling
184	;; and available when they return. True by default.
185	;RestrictInventoryAccessAbroad = True
186
187	;; Warning: advanced and unusual. Default is false.
188	;; Enables configurations where grids share user services, including inventory,
189	;; while separating regions' assets from users' assets. Asset transfer between
190	;; the users' asset server and the regions' asset server is done in HG-like manner.
191	; CheckSeparateAssets = false
192	; RegionHGAssetServerURI = ${Const\|BaseURL}:${Const\|PublicPort}
193
194
195	[HGAssetService]
196	;
197	; === HG ONLY ===
198	; Change this to your server
199	; accessible from other grids
200	;
201	HomeURI = "${Const\|BaseURL}:${Const\|PublicPort}"
202
203	;; The asset types that this grid can export to / import from other grids.
204	;; Comma separated.
205	;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
206	;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
207	;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
208	;;
209	;; Leave blank or commented if you don't want to apply any restrictions.
210	;; A more strict, but still reasonable, policy may be to disallow the exchange
211	;; of scripts, like so:
212	; DisallowExport ="LSLText"
213	; DisallowImport ="LSLBytecode"
214
215	[HGFriendsModule]
216	; User level required to be able to send friendship invitations to foreign users
217	;LevelHGFriends = 0;
218
219	[UserAgentService]
220	;
221	; === HG ONLY ===
222	; Change this to your user agent server (HG robust)
223	;
224	UserAgentServerURI = "${Const\|BaseURL}:${Const\|PublicPort}"
225
226	[MapImageService]
227	MapImageServerURI = "${Const\|BaseURL}:${Const\|PrivatePort}"
228
229	[AuthorizationService]
230	; If you have regions with access restrictions
231	; specify them here using the convention
232	; Region_<Region_Name> = <flags>
233	; Valid flags are:
234	; DisallowForeigners -- HG visitors not allowed
235	; DisallowResidents -- only Admins and Managers allowed
236	; Example:
237	; Region_Test_1 = "DisallowForeigners"
238
239	;; Uncomment if you are using SimianGrid for grid services
240	[SimianGrid]
241	;; SimianGrid services URL
242	;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
243
244	;; Capability assigned by the grid administrator for the simulator
245	;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"