aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
diff options
context:
space:
mode:
authorRobert Adams2013-11-04 22:12:57 -0800
committerRobert Adams2013-11-04 22:12:57 -0800
commitc931b16c1fd50d3b955662c8cd6134d7a235c519 (patch)
tree8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
parentvarregion: add plumbing to pass region size from Scene down to the (diff)
parentIf the LSL state_entry() event definition contains any parameters, then gener... (diff)
downloadopensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2
opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
index 10a4753..bbadc55 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -49,12 +49,10 @@ using OpenSim.Capabilities.Handlers;
49 49
50namespace OpenSim.Region.ClientStack.Linden 50namespace OpenSim.Region.ClientStack.Linden
51{ 51{
52
53 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AvatarPickerSearchModule")] 52 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AvatarPickerSearchModule")]
54 public class AvatarPickerSearchModule : INonSharedRegionModule 53 public class AvatarPickerSearchModule : INonSharedRegionModule
55 { 54 {
56 private static readonly ILog m_log = 55// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
57 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
58 56
59 private Scene m_scene; 57 private Scene m_scene;
60 private IPeople m_People; 58 private IPeople m_People;
@@ -134,6 +132,5 @@ namespace OpenSim.Region.ClientStack.Linden
134 caps.RegisterHandler("AvatarPickerSearch", m_URL); 132 caps.RegisterHandler("AvatarPickerSearch", m_URL);
135 } 133 }
136 } 134 }
137
138 } 135 }
139} 136} \ No newline at end of file