- replace existing license header in each source file in

  AssetInventoryServer with the standard OpenSim license header
- add note about Cable Beach to CONTRIBUTORS.txt
- clean up AssetInventoryServer.ini.example

1 files changed, 17 insertions, 25 deletions

diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example
index 619495c..bba4668 100644
--- a/bin/AssetInventoryServer.ini.example
+++ b/bin/AssetInventoryServer.ini.example
@@ -9,16 +9,15 @@ listen_port = 8003
 ; Asset Storage Provider
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; Simple storage is a very basic storage system for the purposes of illustrating
-; a storage backend example. The assets are stored in SimpleAssets/ and
-; TempAssets/ (which is deleted when the server shuts down). Metadata is
-; generated for all of the files at startup and when new assets are uploaded.
+; SimpleAssetStorage is a very basic storage system for the purposes of
+; illustrating a storage backend example. The assets are stored in
+; SimpleAssets/ and TempAssets/ (which is deleted when the server shuts down).
+; Metadata is generated for all of the files at startup and when new assets are
+; uploaded.
 ;asset_storage_provider = SimpleAssetStorage
 
-; OpenSimMySQL storage connects to a MySQL server that has an assets table created
-; by OpenSim. Open the AssetServer_Config.xml file from OpenSim and use the
-; database connection string for the database_connect option in the MySQL section
-; below. This backend combined with the OpenSimFrontend will allow the asset
+; OpenSimAssetStorage connects to a database that has an assets table created
+; by OpenSim. This backend combined with the OpenSimFrontend will allow the asset
 ; server to be used as a drop-in replacement for OpenSim.Grid.AssetServer.exe,
 ; while also allowing other frontends to run.
 asset_storage_provider = OpenSimAssetStorage
@@ -27,19 +26,17 @@ asset_storage_provider = OpenSimAssetStorage
 ; Inventory Storage Provider
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-; Simple inventory is a very basic inventory storage system for the purposes of
-; illustrating an inventory backend example. The inventory is stored in
-; SimpleInventory/ by creating a folder for each agent that contains all of the
-; inventory items and folders serialized as XML files.
+; SimpleInventoryStorage is a very basic inventory storage system for the
+; purposes of illustrating an inventory backend example. The inventory is stored
+; in SimpleInventory/ by creating a folder for each agent that contains all of
+; the inventory items and folders serialized as XML files.
 ;inventory_storage_provider = SimpleInventoryStorage
 
-; OpenSimMySQL inventory connects to a MySQL server that has an inventory table
-; created by OpenSim. If the OpenSimMySQLStorage backend is also being used, the
-; inventory and asset tables must be stored in the same database. The
-; database_connect string in the MySQL section below is used to connect to the
-; database. This backend combined with the OpenSimInventoryFrontend will allow
-; the server to be used as a drop-in replacement for
+; OpenSimInventoryStorage connects to a database that has an inventory table
+; created by OpenSim. This backend combined with the OpenSimInventoryFrontend
+; will allow the server to be used as a drop-in replacement for
 ; OpenSim.Grid.InventoryServer.exe, while also allowing other frontends to run.
+; *** NOTE: Inventory is not currently implemented.
 inventory_storage_provider = OpenSimInventoryStorage
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -95,9 +92,9 @@ metrics_provider = NullMetrics
 
 frontends = ReferenceFrontend,OpenSimAssetFrontend,OpenSimInventoryFrontend,BrowseFrontend
 
+[OpenSim]
 ; The OpenSim section applies to the OpenSim plugin (OpenSimAssetStorage,
 ; OpenSimInventoryStorage, OpenSimAssetFronend, OpenSimInventoryFrontend).
-[OpenSim]
 
 ; The database provider determines which database to use. Any database backend
 ; supported by OpenSim is supported.
@@ -109,12 +106,7 @@ inventory_database_provider = "OpenSim.Data.SQLite.dll"
 ;inventory_database_provider = "OpenSim.Data.MySQL.dll"
 ;inventory_database_provider = "OpenSim.Data.NHibernate.dll"
 
-; Database connection string used by the OpenSim MySQL backend. If these lines
-; are commented out or missing, the server will look for an
-; AssetServer_Config.xml or InventoryServer_Config.xml file in the current
-; working directory. These files are generated by OpenSim.Grid.AssetServer.exe
-; and OpenSim.Grid.InventoryServer.exe, respectively, and can be used without
-; modification.
+; Database connection string used by the database backend.
 
 ; For SQLite
 asset_database_connect = "URI=file:Asset.db,version=3"