aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.Server.ini.example
diff options
context:
space:
mode:
authorMelanie2010-01-19 04:18:01 +0000
committerMelanie2010-01-19 04:18:01 +0000
commita3f48a7ca66347b11990e5444a636d40bec5dbf1 (patch)
treea5708996ccf28ce8696b8257a0b33352f56e2afe /bin/OpenSim.Server.ini.example
parentAdd a Hyperlink flag to the regions table (diff)
parent* Towards enabling hyperlinks at grid-level. (diff)
downloadopensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.zip
opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.tar.gz
opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.tar.bz2
opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.tar.xz
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
Diffstat (limited to 'bin/OpenSim.Server.ini.example')
-rw-r--r--bin/OpenSim.Server.ini.example5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 3d2a5ba..0c6046f 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -42,7 +42,6 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
42; * 42; *
43[InventoryService] 43[InventoryService]
44 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" 44 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
45 UserServerURI = "http://127.0.0.1:8002"
46 SessionAuthentication = "false" 45 SessionAuthentication = "false"
47 StorageProvider = "OpenSim.Data.MySQL.dll" 46 StorageProvider = "OpenSim.Data.MySQL.dll"
48 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" 47 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
@@ -58,10 +57,12 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
58 Realm = "regions" 57 Realm = "regions"
59 ; AllowDuplicateNames = "True" 58 ; AllowDuplicateNames = "True"
60 ;; Next, we can specify properties of regions, including default and fallback regions 59 ;; Next, we can specify properties of regions, including default and fallback regions
61 ;; The syntax is: Region_<RegioName> = "<flags>" 60 ;; The syntax is: Region_<RegionName> = "<flags>"
61 ;; or: Region_<RegionID> = "<flags>"
62 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate 62 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
63 ;; For example: 63 ;; For example:
64 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" 64 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
65 ; (replace spaces with underscore)
65 66
66; * This is the configuration for the freeswitch server in grid mode 67; * This is the configuration for the freeswitch server in grid mode
67[FreeswitchService] 68[FreeswitchService]