diff options
| author | Melanie | 2010-08-30 02:30:28 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-30 02:30:28 +0100 |
| commit | 79bfa275da6b8be03678bfa284bd205410296b6a (patch) | |
| tree | 1ce2f9f2da9bb0e3a8f5628d54f44e45bfc33044 /bin | |
| parent | Remove CRLF endings (diff) | |
| parent | Fix a casting operation to use ToString() (diff) | |
| download | opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.zip opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.gz opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.bz2 opensim-SC-79bfa275da6b8be03678bfa284bd205410296b6a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | bin/Newtonsoft.Json.Net20.dll (renamed from bin/Newtonsoft.Json.dll) | bin | 356352 -> 356352 bytes | |||
| -rw-r--r-- | bin/Robust.ini.example | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/Newtonsoft.Json.dll b/bin/Newtonsoft.Json.Net20.dll index 177d9b5..177d9b5 100644 --- a/bin/Newtonsoft.Json.dll +++ b/bin/Newtonsoft.Json.Net20.dll | |||
| Binary files differ | |||
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 0353eec..093ead8 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -57,8 +57,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 57 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 57 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
| 58 | ; Realm = "regions" | 58 | ; Realm = "regions" |
| 59 | ; AllowDuplicateNames = "True" | 59 | ; AllowDuplicateNames = "True" |
| 60 | ; Check4096 = "False" | 60 | |
| 61 | |||
| 62 | ;; Next, we can specify properties of regions, including default and fallback regions | 61 | ;; Next, we can specify properties of regions, including default and fallback regions |
| 63 | ;; The syntax is: Region_<RegionName> = "<flags>" | 62 | ;; The syntax is: Region_<RegionName> = "<flags>" |
| 64 | ;; or: Region_<RegionID> = "<flags>" | 63 | ;; or: Region_<RegionID> = "<flags>" |