aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include/StandaloneCommon.ini.example
diff options
context:
space:
mode:
authorDiva Canto2012-03-20 17:19:14 -0700
committerDiva Canto2012-03-20 17:19:14 -0700
commit3fa51f66ec2f032134f333bf1fa047275a77f6e0 (patch)
tree952df67fcc209ecc81ce66b92f4bdf93a7017e08 /bin/config-include/StandaloneCommon.ini.example
parentHG Friends: allow the establishment of HG friendships without requiring co-pr... (diff)
parentAdd ability to log warn if a frame takes longer than twice the expected time.... (diff)
downloadopensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.zip
opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.gz
opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.bz2
opensim-SC_OLD-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts: OpenSim/Framework/Util.cs
Diffstat (limited to 'bin/config-include/StandaloneCommon.ini.example')
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4c734a1..3dfbed7 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -44,7 +44,6 @@
44 ;AuthorizationServices = "LocalAuthorizationServicesConnector" 44 ;AuthorizationServices = "LocalAuthorizationServicesConnector"
45 45
46[AssetService] 46[AssetService]
47 StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
48 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 47 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
49 AssetLoaderArgs = "assets/AssetSets.xml" 48 AssetLoaderArgs = "assets/AssetSets.xml"
50 49
@@ -241,4 +240,4 @@
241 ; DisallowForeigners -- HG visitors not allowed 240 ; DisallowForeigners -- HG visitors not allowed
242 ; DisallowResidents -- only Admins and Managers allowed 241 ; DisallowResidents -- only Admins and Managers allowed
243 ; Example: 242 ; Example:
244 ; Region_Test_1 = "DisallowForeigners" \ No newline at end of file 243 ; Region_Test_1 = "DisallowForeigners"