diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 3 |
2 files changed, 3 insertions, 7 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 | ||
50 | namespace OpenSim.Region.ClientStack.Linden | 50 | namespace 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 |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs index 79a935d..4501dd9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
107 | 107 | ||
108 | public void RegisterCaps(UUID agentID, Caps caps) | 108 | public void RegisterCaps(UUID agentID, Caps caps) |
109 | { | 109 | { |
110 | UUID capID = UUID.Random(); | 110 | // UUID capID = UUID.Random(); |
111 | 111 | ||
112 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | 112 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); |
113 | if (m_URL == "localhost") | 113 | if (m_URL == "localhost") |
@@ -127,7 +127,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
127 | { | 127 | { |
128 | caps.RegisterHandler("UploadBakedTexture", m_URL); | 128 | caps.RegisterHandler("UploadBakedTexture", m_URL); |
129 | } | 129 | } |
130 | |||
131 | } | 130 | } |
132 | } | 131 | } |
133 | } \ No newline at end of file | 132 | } \ No newline at end of file |