diff options
| author | Melanie | 2013-08-17 03:23:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-17 03:23:45 +0100 |
| commit | bef03fb30be67dbe671dcc330558daf8a6c4bb22 (patch) | |
| tree | 6d221db8af5bdb1a09190527a79aae3dfe3116d9 /OpenSim/Region/ClientStack/Linden/Caps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove mono compiler warnings from UserProfilesModule (diff) | |
| download | opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.zip opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.gz opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.bz2 opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs index 9f2aed0..10a4753 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | |||
| @@ -123,7 +123,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 123 | 123 | ||
| 124 | if (m_URL == "localhost") | 124 | if (m_URL == "localhost") |
| 125 | { | 125 | { |
| 126 | m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | 126 | // m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); |
| 127 | caps.RegisterHandler( | 127 | caps.RegisterHandler( |
| 128 | "AvatarPickerSearch", | 128 | "AvatarPickerSearch", |
| 129 | new AvatarPickerSearchHandler("/CAPS/" + capID + "/", m_People, "AvatarPickerSearch", "Search for avatars by name")); | 129 | new AvatarPickerSearchHandler("/CAPS/" + capID + "/", m_People, "AvatarPickerSearch", "Search for avatars by name")); |