ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source 
Conflicts:
	OpenSim/Framework/Util.cs
This commit is contained in:
Diva Canto
2012-03-20 17:19:14 -07:00
parent d08ad6459a 7bf628ab31
commit 3fa51f66ec
32 changed files with 522 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/Robust.HG.ini.example
View File

@@ -66,7 +66,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; * in turn, reads the asset loader and database connection information
; *
[AssetService]
StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
AssetLoaderArgs = "./assets/AssetSets.xml"

1
bin/Robust.ini.example
View File

@@ -58,7 +58,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; * in turn, reads the asset loader and database connection information
; *
[AssetService]
StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
AssetLoaderArgs = "./assets/AssetSets.xml"

3
bin/config-include/StandaloneCommon.ini.example
View File

@@ -44,7 +44,6 @@
;AuthorizationServices = "LocalAuthorizationServicesConnector"
[AssetService]
StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
AssetLoaderArgs = "assets/AssetSets.xml"
@@ -241,4 +240,4 @@
; DisallowForeigners -- HG visitors not allowed
; DisallowResidents -- only Admins and Managers allowed
; Example:
; Region_Test_1 = "DisallowForeigners"
; Region_Test_1 = "DisallowForeigners"

3
bin/shutdown_commands.txt
View File

@@ -1,3 +0,0 @@
; You can place simulator console commands here to execute when the simulator is shut down
; e.g. show stats
; Lines starting with ; are comments

3
bin/shutdown_commands.txt.example Normal file
View File

@@ -0,0 +1,3 @@
; Copy this file to shutdown_commands.txt to execute region console commands when the simulator is asked to shut down
; e.g. show stats
; Lines that start with ; are comments

3
bin/startup_commands.txt
View File

@@ -1,3 +0,0 @@
; You can place region console commands here to execute once the simulator has finished starting up
; e.g. show stats
; Lines start with ; are comments.

3
bin/startup_commands.txt.example Normal file
View File

@@ -0,0 +1,3 @@
; Copy this file to startup_commands.txt to run region console commands once the simulator has finished starting up
; e.g. show stats
; Lines that start with ; are comments.