diff options
| author | Diva Canto | 2011-02-16 09:57:43 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-02-16 09:57:43 -0800 |
| commit | dd4a503a2205d9aed57216de6615f349491a4c22 (patch) | |
| tree | 3c90e7c217f7fcb30cb43a102ee4551bd27bf1c4 /bin | |
| parent | Fix bug introduced by Query Access. The response does not come in a packaged ... (diff) | |
| parent | Changed console command "alert" and added new command "alert-user". (diff) | |
| download | opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.zip opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.tar.gz opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.tar.bz2 opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 | ||||
| -rw-r--r-- | bin/config-include/GridCommon.ini.example | 2 | ||||
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 9adf1ac..f12a143 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -72,7 +72,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 72 | AssetService = "OpenSim.Services.AssetService.dll:AssetService" | 72 | AssetService = "OpenSim.Services.AssetService.dll:AssetService" |
| 73 | 73 | ||
| 74 | ;; Directory for map tile images of linked regions | 74 | ;; Directory for map tile images of linked regions |
| 75 | ; MapTileDirectory = "./" | 75 | ; MapTileDirectory = "./maptiles" |
| 76 | 76 | ||
| 77 | ;; Next, we can specify properties of regions, including default and fallback regions | 77 | ;; Next, we can specify properties of regions, including default and fallback regions |
| 78 | ;; The syntax is: Region_<RegionName> = "<flags>" | 78 | ;; The syntax is: Region_<RegionName> = "<flags>" |
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index e1bcf00..4dc0e53 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | ;AllowHypergridMapSearch = true | 43 | ;AllowHypergridMapSearch = true |
| 44 | 44 | ||
| 45 | ;; Directory for map tile images of linked regions | 45 | ;; Directory for map tile images of linked regions |
| 46 | ; MapTileDirectory = "./" | 46 | ; MapTileDirectory = "./maptiles" |
| 47 | 47 | ||
| 48 | [AvatarService] | 48 | [AvatarService] |
| 49 | ; | 49 | ; |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 213219c..816e9a6 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | ; Check4096 = true | 70 | ; Check4096 = true |
| 71 | 71 | ||
| 72 | ;; Directory for map tile images of remote regions | 72 | ;; Directory for map tile images of remote regions |
| 73 | ; MapTileDirectory = "./" | 73 | ; MapTileDirectory = "./maptiles" |
| 74 | 74 | ||
| 75 | ;; Next, we can specify properties of regions, including default and fallback regions | 75 | ;; Next, we can specify properties of regions, including default and fallback regions |
| 76 | ;; The syntax is: Region_<RegioName> = "<flags>" | 76 | ;; The syntax is: Region_<RegioName> = "<flags>" |