6 files changed, 79 insertions, 79 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 7f9db1c..6a339f2 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,6 +1,6 @@
-[Includes]
+[Includes]
-    Include-Common = "config-include/GridCommon.ini"
+    Include-Common = "config-include/GridCommon.ini"
-[Modules]
+[Modules]
-    AssetServices = "RemoteAssetServicesConnector"
+    AssetServices = "RemoteAssetServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 0e95f35..de57c98 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,17 +1,17 @@
-[Modules]
+[Modules]
-    AssetCaching = "CoreAssetCache"
+    AssetCaching = "CoreAssetCache"
-[AssetCache]
+[AssetCache]
-    ; Number of buckets for assets
+    ; Number of buckets for assets
-    CacheBuckets = 32768
+    CacheBuckets = 32768
-[AssetService]
+[AssetService]
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
+    AssetLoaderArgs = "assets/AssetSets.xml"
-    ;
+    ;
-    ; change this to your grid-wide asset server
+    ; change this to your grid-wide asset server
-    ;
+    ;
-    AssetServerURI = "http://myassetserver.com:8003"
+    AssetServerURI = "http://myassetserver.com:8003"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 5a93b79..e21f306 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,10 +1,10 @@
-[Includes]
+[Includes]
-    Include-Common = "config-include/GridCommon.ini"
+    Include-Common = "config-include/GridCommon.ini"
-[Modules]
+[Modules]
-    AssetServices = "HGAssetBroker"
+    AssetServices = "HGAssetBroker"
-[AssetService]
+[AssetService]
-    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index c35cda9..dd9fdb5 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,10 +1,10 @@
-[Includes]
+[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Common = "config-include/StandaloneCommon.ini"
-[Modules]
+[Modules]
-    AssetServices = "LocalAssetServicesConnector"
+    AssetServices = "LocalAssetServicesConnector"
-[AssetService]
+[AssetService]
-    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a14c653..001b3a0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,21 +1,21 @@
-[Modules]
+[Modules]
-    AssetCaching = "CoreAssetCache"
+    AssetCaching = "CoreAssetCache"
-[AssetCache]
+[AssetCache]
-    ; Number of buckets for assets
+    ; Number of buckets for assets
-    CacheBuckets = 16384
+    CacheBuckets = 16384
-[AssetService]
+[AssetService]
-    ;
+    ;
-    ;### Choose the DB
+    ;### Choose the DB
-    ;
+    ;
-    ;--- For SQLite
+    ;--- For SQLite
-    StorageProvider = "OpenSim.Data.SQLite.dll"
+    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;--- For MySql
+    ;--- For MySql
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
+    AssetLoaderArgs = "assets/AssetSets.xml"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 975132b..a97ac7b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,15 +1,15 @@
-[Includes]
+[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Common = "config-include/StandaloneCommon.ini"
-[Modules]
+[Modules]
-    AssetServices = "HGAssetBroker"
+    AssetServices = "HGAssetBroker"
-[AssetService]
+[AssetService]
-    ; For the RegionAssetService
+    ; For the RegionAssetService
-    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
+    LocalServiceModule    = "OpenSim.Services.AssetService.dll:AssetService"
-    ; For HGAssetBroker
+    ; For HGAssetBroker
-    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
+    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 7f9db1c..6a339f2 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini
@@ -1,6 +1,6 @@
1	[Includes]	1	[Includes]
2	Include-Common = "config-include/GridCommon.ini"	2	Include-Common = "config-include/GridCommon.ini"
3		3
4	[Modules]	4	[Modules]
5	AssetServices = "RemoteAssetServicesConnector"	5	AssetServices = "RemoteAssetServicesConnector"
6		6


diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 0e95f35..de57c98 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example
@@ -1,17 +1,17 @@
1	[Modules]	1	[Modules]
2	AssetCaching = "CoreAssetCache"	2	AssetCaching = "CoreAssetCache"
3		3
4	[AssetCache]	4	[AssetCache]
5	; Number of buckets for assets	5	; Number of buckets for assets
6	CacheBuckets = 32768	6	CacheBuckets = 32768
7		7
8	[AssetService]	8	[AssetService]
9		9
10	DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"	10	DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
11	AssetLoaderArgs = "assets/AssetSets.xml"	11	AssetLoaderArgs = "assets/AssetSets.xml"
12		12
13	;	13	;
14	; change this to your grid-wide asset server	14	; change this to your grid-wide asset server
15	;	15	;
16	AssetServerURI = "http://myassetserver.com:8003"	16	AssetServerURI = "http://myassetserver.com:8003"
17		17


diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 5a93b79..e21f306 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini
@@ -1,10 +1,10 @@
1	[Includes]	1	[Includes]
2	Include-Common = "config-include/GridCommon.ini"	2	Include-Common = "config-include/GridCommon.ini"
3		3
4	[Modules]	4	[Modules]
5	AssetServices = "HGAssetBroker"	5	AssetServices = "HGAssetBroker"
6		6
7		7
8	[AssetService]	8	[AssetService]
9	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"	9	LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
10	HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"	10	HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"


diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index c35cda9..dd9fdb5 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini
@@ -1,10 +1,10 @@
1	[Includes]	1	[Includes]
2	Include-Common = "config-include/StandaloneCommon.ini"	2	Include-Common = "config-include/StandaloneCommon.ini"
3		3
4	[Modules]	4	[Modules]
5	AssetServices = "LocalAssetServicesConnector"	5	AssetServices = "LocalAssetServicesConnector"
6		6
7		7
8	[AssetService]	8	[AssetService]
9	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	9	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
10		10


diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index a14c653..001b3a0 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,21 +1,21 @@
1	[Modules]	1	[Modules]
2	AssetCaching = "CoreAssetCache"	2	AssetCaching = "CoreAssetCache"
3		3
4	[AssetCache]	4	[AssetCache]
5	; Number of buckets for assets	5	; Number of buckets for assets
6	CacheBuckets = 16384	6	CacheBuckets = 16384
7		7
8	[AssetService]	8	[AssetService]
9	;	9	;
10	;### Choose the DB	10	;### Choose the DB
11	;	11	;
12	;--- For SQLite	12	;--- For SQLite
13	StorageProvider = "OpenSim.Data.SQLite.dll"	13	StorageProvider = "OpenSim.Data.SQLite.dll"
14	;--- For MySql	14	;--- For MySql
15	;StorageProvider = "OpenSim.Data.MySQL.dll"	15	;StorageProvider = "OpenSim.Data.MySQL.dll"
16	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"	16	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
17		17
18	DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"	18	DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
19	AssetLoaderArgs = "assets/AssetSets.xml"	19	AssetLoaderArgs = "assets/AssetSets.xml"
20		20
21		21


diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 975132b..a97ac7b 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,15 +1,15 @@
1	[Includes]	1	[Includes]
2	Include-Common = "config-include/StandaloneCommon.ini"	2	Include-Common = "config-include/StandaloneCommon.ini"
3		3
4	[Modules]	4	[Modules]
5	AssetServices = "HGAssetBroker"	5	AssetServices = "HGAssetBroker"
6		6
7		7
8	[AssetService]	8	[AssetService]
9	; For the RegionAssetService	9	; For the RegionAssetService
10	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"	10	LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
11		11
12	; For HGAssetBroker	12	; For HGAssetBroker
13	LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"	13	LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
14	HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"	14	HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
15		15