ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2013-05-12 03:24:57 +01:00
parent 13cd8c17d7 a4431381fa
commit e8f4c7128f
4 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
View File

@@ -71,7 +71,6 @@ namespace OpenSim.Region.ClientStack.Linden
return;
m_URL = config.GetString("Cap_AvatarPickerSearch", string.Empty);
m_log.DebugFormat("[XXX]: Cap_AvatarPickerSearch = {0}", m_URL);
// Cap doesn't exist
if (m_URL != string.Empty)
m_Enabled = true;