diff options
| author | Melanie | 2013-05-12 03:24:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-12 03:24:57 +0100 |
| commit | e8f4c7128fc65f12ef33b152e14b072809667642 (patch) | |
| tree | a1708d78fa0ef078bf4d47233477fe531149e1ad /OpenSim/Region/ClientStack/Linden/Caps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ... (diff) | |
| download | opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.zip opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.tar.gz opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.tar.bz2 opensim-SC-e8f4c7128fc65f12ef33b152e14b072809667642.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs index d7af1f2..9f2aed0 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | |||
| @@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 71 | return; | 71 | return; |
| 72 | 72 | ||
| 73 | m_URL = config.GetString("Cap_AvatarPickerSearch", string.Empty); | 73 | m_URL = config.GetString("Cap_AvatarPickerSearch", string.Empty); |
| 74 | m_log.DebugFormat("[XXX]: Cap_AvatarPickerSearch = {0}", m_URL); | ||
| 75 | // Cap doesn't exist | 74 | // Cap doesn't exist |
| 76 | if (m_URL != string.Empty) | 75 | if (m_URL != string.Empty) |
| 77 | m_Enabled = true; | 76 | m_Enabled = true; |