diff options
| author | Justin Clark-Casey (justincc) | 2015-01-30 21:22:57 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-01-30 21:22:57 +0000 |
| commit | 144f1400c54419f1b174d7a6fa80c97abda98b67 (patch) | |
| tree | 21b3b8f8e13a0c485b1ffa6178d182b50b448e87 | |
| parent | minor: correct log message when script with non-config stop strategy is detec... (diff) | |
| download | opensim-SC-144f1400c54419f1b174d7a6fa80c97abda98b67.zip opensim-SC-144f1400c54419f1b174d7a6fa80c97abda98b67.tar.gz opensim-SC-144f1400c54419f1b174d7a6fa80c97abda98b67.tar.bz2 opensim-SC-144f1400c54419f1b174d7a6fa80c97abda98b67.tar.xz | |
Disable display name cap config in RC branch for now until issues have been worked through.
| -rw-r--r-- | bin/OpenSim.ini.example | 1 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d352c33..987d8b2 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -567,7 +567,6 @@ | |||
| 567 | Cap_GetTexture = "localhost" | 567 | Cap_GetTexture = "localhost" |
| 568 | Cap_GetMesh = "localhost" | 568 | Cap_GetMesh = "localhost" |
| 569 | Cap_AvatarPickerSearch = "localhost" | 569 | Cap_AvatarPickerSearch = "localhost" |
| 570 | Cap_GetDisplayNames = "localhost" | ||
| 571 | 570 | ||
| 572 | 571 | ||
| 573 | [SimulatorFeatures] | 572 | [SimulatorFeatures] |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 4faf7f3..aa5b7e5 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -645,7 +645,7 @@ | |||
| 645 | Cap_ObjectMediaNavigate = "localhost" | 645 | Cap_ObjectMediaNavigate = "localhost" |
| 646 | Cap_FetchLib = "" | 646 | Cap_FetchLib = "" |
| 647 | Cap_FetchLibDescendents = "" | 647 | Cap_FetchLibDescendents = "" |
| 648 | Cap_GetDisplayNames = "localhost" | 648 | Cap_GetDisplayNames = "" |
| 649 | Cap_GetTexture = "localhost" | 649 | Cap_GetTexture = "localhost" |
| 650 | Cap_GetMesh = "localhost" | 650 | Cap_GetMesh = "localhost" |
| 651 | Cap_GetObjectCost = "" | 651 | Cap_GetObjectCost = "" |