ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +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

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"