diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
-rw-r--r-- | bin/Robust.HG.ini.example | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 8fe6d0c..2ad262a 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -126,6 +126,15 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset | |||
126 | ; GatekeeperURI = "http://127.0.0.1:8002" | 126 | ; GatekeeperURI = "http://127.0.0.1:8002" |
127 | 127 | ||
128 | [DatabaseService] | 128 | [DatabaseService] |
129 | ; PGSQL | ||
130 | ; Uncomment these lines if you want to use PGSQL storage | ||
131 | ; Change the connection string to your db details | ||
132 | ;StorageProvider = "OpenSim.Data.PGSQL.dll" | ||
133 | ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;" | ||
134 | |||
135 | ; MySQL | ||
136 | ; Uncomment these lines if you want to use MySQL storage | ||
137 | ; Change the connection string to your db details | ||
129 | StorageProvider = "OpenSim.Data.MySQL.dll" | 138 | StorageProvider = "OpenSim.Data.MySQL.dll" |
130 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" | 139 | ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" |
131 | 140 | ||