aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs24
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs6
-rw-r--r--OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs17
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs10
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs309
-rw-r--r--OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs13
11 files changed, 239 insertions, 164 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 633d005..510be37 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -85,16 +85,26 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
85 if (modulesConfig == null) 85 if (modulesConfig == null)
86 modulesConfig = m_openSim.ConfigSource.Source.AddConfig("Modules"); 86 modulesConfig = m_openSim.ConfigSource.Source.AddConfig("Modules");
87 87
88 Dictionary<RuntimeAddin, IList<int>> loadedModules = new Dictionary<RuntimeAddin, IList<int>>();
89
88 // Scan modules and load all that aren't disabled 90 // Scan modules and load all that aren't disabled
89 foreach (TypeExtensionNode node in 91 foreach (TypeExtensionNode node in
90 AddinManager.GetExtensionNodes("/OpenSim/RegionModules")) 92 AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
91 { 93 {
94 IList<int> loadedModuleData;
95
96 if (!loadedModules.ContainsKey(node.Addin))
97 loadedModules.Add(node.Addin, new List<int> { 0, 0, 0 });
98
99 loadedModuleData = loadedModules[node.Addin];
100
92 if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null) 101 if (node.Type.GetInterface(typeof(ISharedRegionModule).ToString()) != null)
93 { 102 {
94 if (CheckModuleEnabled(node, modulesConfig)) 103 if (CheckModuleEnabled(node, modulesConfig))
95 { 104 {
96 m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type); 105 m_log.DebugFormat("[REGIONMODULES]: Found shared region module {0}, class {1}", node.Id, node.Type);
97 m_sharedModules.Add(node); 106 m_sharedModules.Add(node);
107 loadedModuleData[0]++;
98 } 108 }
99 } 109 }
100 else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null) 110 else if (node.Type.GetInterface(typeof(INonSharedRegionModule).ToString()) != null)
@@ -103,14 +113,26 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
103 { 113 {
104 m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type); 114 m_log.DebugFormat("[REGIONMODULES]: Found non-shared region module {0}, class {1}", node.Id, node.Type);
105 m_nonSharedModules.Add(node); 115 m_nonSharedModules.Add(node);
116 loadedModuleData[1]++;
106 } 117 }
107 } 118 }
108 else 119 else
109 { 120 {
110 m_log.DebugFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type); 121 m_log.WarnFormat("[REGIONMODULES]: Found unknown type of module {0}, class {1}", node.Id, node.Type);
122 loadedModuleData[2]++;
111 } 123 }
112 } 124 }
113 125
126 foreach (KeyValuePair<RuntimeAddin, IList<int>> loadedModuleData in loadedModules)
127 {
128 m_log.InfoFormat(
129 "[REGIONMODULES]: From plugin {0}, (version {1}), loaded {2} modules, {3} shared, {4} non-shared {5} unknown",
130 loadedModuleData.Key.Id,
131 loadedModuleData.Key.Version,
132 loadedModuleData.Value[0] + loadedModuleData.Value[1] + loadedModuleData.Value[2],
133 loadedModuleData.Value[0], loadedModuleData.Value[1], loadedModuleData.Value[2]);
134 }
135
114 // Load and init the module. We try a constructor with a port 136 // Load and init the module. We try a constructor with a port
115 // if a port was given, fall back to one without if there is 137 // if a port was given, fall back to one without if there is
116 // no port or the more specific constructor fails. 138 // no port or the more specific constructor fails.
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 27af009..df1950d 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1960,6 +1960,12 @@ namespace OpenSim.Framework.Servers.HttpServer
1960 m_rpcHandlers.Remove(method); 1960 m_rpcHandlers.Remove(method);
1961 } 1961 }
1962 1962
1963 public void RemoveJsonRPCHandler(string method)
1964 {
1965 lock(jsonRpcHandlers)
1966 jsonRpcHandlers.Remove(method);
1967 }
1968
1963 public bool RemoveLLSDHandler(string path, LLSDMethod handler) 1969 public bool RemoveLLSDHandler(string path, LLSDMethod handler)
1964 { 1970 {
1965 lock (m_llsdHandlers) 1971 lock (m_llsdHandlers)
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index 71ca3ff..d162bc1 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -140,6 +140,8 @@ namespace OpenSim.Framework.Servers.HttpServer
140 void RemoveStreamHandler(string httpMethod, string path); 140 void RemoveStreamHandler(string httpMethod, string path);
141 141
142 void RemoveXmlRPCHandler(string method); 142 void RemoveXmlRPCHandler(string method);
143
144 void RemoveJsonRPCHandler(string method);
143 145
144 string GetHTTP404(string host); 146 string GetHTTP404(string host);
145 147
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index bb8825b..ee96b47 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -108,6 +108,7 @@ namespace OpenSim.Framework.Servers.HttpServer
108 private int _bufferLength; 108 private int _bufferLength;
109 private bool _closing; 109 private bool _closing;
110 private bool _upgraded; 110 private bool _upgraded;
111 private int _maxPayloadBytes = 41943040;
111 112
112 private const string HandshakeAcceptText = 113 private const string HandshakeAcceptText =
113 "HTTP/1.1 101 Switching Protocols\r\n" + 114 "HTTP/1.1 101 Switching Protocols\r\n" +
@@ -196,6 +197,15 @@ namespace OpenSim.Framework.Servers.HttpServer
196 } 197 }
197 198
198 /// <summary> 199 /// <summary>
200 /// Max Payload Size in bytes. Defaults to 40MB, but could be set upon connection before calling handshake and upgrade.
201 /// </summary>
202 public int MaxPayloadSize
203 {
204 get { return _maxPayloadBytes; }
205 set { _maxPayloadBytes = value; }
206 }
207
208 /// <summary>
199 /// This triggers the websocket start the upgrade process 209 /// This triggers the websocket start the upgrade process
200 /// </summary> 210 /// </summary>
201 public void HandshakeAndUpgrade() 211 public void HandshakeAndUpgrade()
@@ -367,7 +377,12 @@ namespace OpenSim.Framework.Servers.HttpServer
367 if (headerread) 377 if (headerread)
368 { 378 {
369 _socketState.FrameComplete = false; 379 _socketState.FrameComplete = false;
370 380 if (pheader.PayloadLen > (ulong) _maxPayloadBytes)
381 {
382 Close("Invalid Payload size");
383
384 return;
385 }
371 if (pheader.PayloadLen > 0) 386 if (pheader.PayloadLen > 0)
372 { 387 {
373 if ((int) pheader.PayloadLen > _bufferPosition - offset) 388 if ((int) pheader.PayloadLen > _bufferPosition - offset)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 60c1814..1b68603 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
@@ -57,7 +57,6 @@ namespace OpenSim.Region.ClientStack.Linden
57 public bool Enabled { get; private set; } 57 public bool Enabled { get; private set; }
58 58
59 private Scene m_scene; 59 private Scene m_scene;
60 private UUID m_agentID;
61 60
62 #region ISharedRegionModule Members 61 #region ISharedRegionModule Members
63 62
@@ -118,13 +117,14 @@ namespace OpenSim.Region.ClientStack.Linden
118 public void RegisterCaps(UUID agentID, Caps caps) 117 public void RegisterCaps(UUID agentID, Caps caps)
119 { 118 {
120 IRequestHandler reqHandler 119 IRequestHandler reqHandler
121 = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag, "MeshUploadFlag", agentID.ToString()); 120 = new RestHTTPHandler(
121 "GET", "/CAPS/" + UUID.Random(), ht => MeshUploadFlag(ht, agentID), "MeshUploadFlag", agentID.ToString());
122 122
123 caps.RegisterHandler("MeshUploadFlag", reqHandler); 123 caps.RegisterHandler("MeshUploadFlag", reqHandler);
124 m_agentID = agentID; 124
125 } 125 }
126 126
127 private Hashtable MeshUploadFlag(Hashtable mDhttpMethod) 127 private Hashtable MeshUploadFlag(Hashtable mDhttpMethod, UUID agentID)
128 { 128 {
129// m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request"); 129// m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request");
130 130
@@ -148,4 +148,4 @@ namespace OpenSim.Region.ClientStack.Linden
148 return responsedata; 148 return responsedata;
149 } 149 }
150 } 150 }
151} \ No newline at end of file 151}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 9c26afe..08da88d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -822,6 +822,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
822 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType); 822 handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
823 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes; 823 handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
824 824
825 handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
825// OutPacket(handshake, ThrottleOutPacketType.Task); 826// OutPacket(handshake, ThrottleOutPacketType.Task);
826 // use same as MoveAgentIntoRegion (both should be task ) 827 // use same as MoveAgentIntoRegion (both should be task )
827 OutPacket(handshake, ThrottleOutPacketType.Unknown); 828 OutPacket(handshake, ThrottleOutPacketType.Unknown);
@@ -3604,7 +3605,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3604 3605
3605 avp.Sender.IsTrial = false; 3606 avp.Sender.IsTrial = false;
3606 avp.Sender.ID = agentID; 3607 avp.Sender.ID = agentID;
3607 m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); 3608 avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0];
3609 //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
3608 OutPacket(avp, ThrottleOutPacketType.Task); 3610 OutPacket(avp, ThrottleOutPacketType.Task);
3609 } 3611 }
3610 3612
@@ -4224,7 +4226,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4224 pack.Stat = stats.StatsBlock; 4226 pack.Stat = stats.StatsBlock;
4225 4227
4226 pack.Header.Reliable = false; 4228 pack.Header.Reliable = false;
4227 4229 pack.RegionInfo = new SimStatsPacket.RegionInfoBlock[0];
4228 OutPacket(pack, ThrottleOutPacketType.Task); 4230 OutPacket(pack, ThrottleOutPacketType.Task);
4229 } 4231 }
4230 4232
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 6323160..165dd17 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -256,12 +256,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
256 256
257// m_log.DebugFormat("[ATTACHMENTS MODULE]: Saving changed attachments for {0}", sp.Name); 257// m_log.DebugFormat("[ATTACHMENTS MODULE]: Saving changed attachments for {0}", sp.Name);
258 258
259 List<SceneObjectGroup> attachments = sp.GetAttachments();
260
261 if (attachments.Count <= 0)
262 return;
263
264 Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>();
265
266 foreach (SceneObjectGroup so in attachments)
267 {
268 // Scripts MUST be snapshotted before the object is
269 // removed from the scene because doing otherwise will
270 // clobber the run flag
271 // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from
272 // scripts performing attachment operations at the same time. Getting object states stops the scripts.
273 scriptStates[so] = PrepareScriptInstanceForSave(so, false);
274 }
275
259 lock (sp.AttachmentsSyncLock) 276 lock (sp.AttachmentsSyncLock)
260 { 277 {
261 foreach (SceneObjectGroup so in sp.GetAttachments()) 278 foreach (SceneObjectGroup so in attachments)
262 { 279 UpdateDetachedObject(sp, so, scriptStates[so]);
263 UpdateDetachedObject(sp, so);
264 }
265 280
266 sp.ClearAttachments(); 281 sp.ClearAttachments();
267 } 282 }
@@ -300,32 +315,40 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
300 315
301 private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool temp) 316 private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool temp)
302 { 317 {
303 lock (sp.AttachmentsSyncLock)
304 {
305// m_log.DebugFormat( 318// m_log.DebugFormat(
306// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})", 319// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
307// group.Name, group.LocalId, sp.Name, attachmentPt, silent); 320// group.Name, group.LocalId, sp.Name, attachmentPt, silent);
308 321
309 if (group.GetSittingAvatarsCount() != 0) 322 if (group.GetSittingAvatarsCount() != 0)
310 { 323 {
311// m_log.WarnFormat( 324// m_log.WarnFormat(
312// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it", 325// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
313// group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount()); 326// group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
314 327
315 return false; 328 return false;
316 } 329 }
317 330
318 if (sp.GetAttachments(attachmentPt).Contains(group)) 331 if (sp.GetAttachments(attachmentPt).Contains(group))
319 { 332 {
320 // m_log.WarnFormat( 333// m_log.WarnFormat(
321 // "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached", 334// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
322 // group.Name, group.LocalId, sp.Name, AttachmentPt); 335// group.Name, group.LocalId, sp.Name, AttachmentPt);
323 336
324 return false; 337 return false;
325 } 338 }
326 339
340 // Remove any previous attachments
341 List<SceneObjectGroup> existingAttachments = sp.GetAttachments(attachmentPt);
342 string existingAttachmentScriptState = null;
343
344 // At the moment we can only deal with a single attachment
345 if (existingAttachments.Count != 0 && existingAttachments[0].FromItemID != UUID.Zero)
346 DetachSingleAttachmentToInv(sp, group);
347
348 lock (sp.AttachmentsSyncLock)
349 {
327 Vector3 attachPos = group.AbsolutePosition; 350 Vector3 attachPos = group.AbsolutePosition;
328 351
329 // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should 352 // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should
330 // be removed when that functionality is implemented in opensim 353 // be removed when that functionality is implemented in opensim
331 attachmentPt &= 0x7f; 354 attachmentPt &= 0x7f;
@@ -337,14 +360,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
337 { 360 {
338 attachPos = Vector3.Zero; 361 attachPos = Vector3.Zero;
339 } 362 }
340 363
341 // AttachmentPt 0 means the client chose to 'wear' the attachment. 364 // AttachmentPt 0 means the client chose to 'wear' the attachment.
342 if (attachmentPt == 0) 365 if (attachmentPt == 0)
343 { 366 {
344 // Check object for stored attachment point 367 // Check object for stored attachment point
345 attachmentPt = group.AttachmentPoint; 368 attachmentPt = group.AttachmentPoint;
346 } 369 }
347 370
348 // if we still didn't find a suitable attachment point....... 371 // if we still didn't find a suitable attachment point.......
349 if (attachmentPt == 0) 372 if (attachmentPt == 0)
350 { 373 {
@@ -376,7 +399,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
376 399
377 if (sp.PresenceType != PresenceType.Npc) 400 if (sp.PresenceType != PresenceType.Npc)
378 UpdateUserInventoryWithAttachment(sp, group, attachmentPt, temp); 401 UpdateUserInventoryWithAttachment(sp, group, attachmentPt, temp);
379 402
380 AttachToAgent(sp, group, attachmentPt, attachPos, silent); 403 AttachToAgent(sp, group, attachmentPt, attachPos, silent);
381 } 404 }
382 405
@@ -385,21 +408,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
385 408
386 private void UpdateUserInventoryWithAttachment(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool temp) 409 private void UpdateUserInventoryWithAttachment(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool temp)
387 { 410 {
388 // Remove any previous attachments
389 List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
390
391 // At the moment we can only deal with a single attachment
392 if (attachments.Count != 0)
393 {
394 if (attachments[0].FromItemID != UUID.Zero)
395 DetachSingleAttachmentToInvInternal(sp, attachments[0]);
396 // Error logging commented because UUID.Zero now means temp attachment
397// else
398// m_log.WarnFormat(
399// "[ATTACHMENTS MODULE]: When detaching existing attachment {0} {1} at point {2} to make way for {3} {4} for {5}, couldn't find the associated item ID to adjust inventory attachment record!",
400// attachments[0].Name, attachments[0].LocalId, attachmentPt, group.Name, group.LocalId, sp.Name);
401 }
402
403 // Add the new attachment to inventory if we don't already have it. 411 // Add the new attachment to inventory if we don't already have it.
404 if (!temp) 412 if (!temp)
405 { 413 {
@@ -464,12 +472,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
464 return; 472 return;
465 473
466 // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name); 474 // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name);
467 lock (sp.AttachmentsSyncLock) 475
476 foreach (KeyValuePair<UUID, uint> rez in rezlist)
468 { 477 {
469 foreach (KeyValuePair<UUID, uint> rez in rezlist) 478 RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value);
470 {
471 RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value);
472 }
473 } 479 }
474 } 480 }
475 481
@@ -549,25 +555,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
549 555
550 public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so) 556 public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
551 { 557 {
558 if (so.AttachedAvatar != sp.UUID)
559 {
560 m_log.WarnFormat(
561 "[ATTACHMENTS MODULE]: Tried to detach object {0} from {1} {2} but attached avatar id was {3} in {4}",
562 so.Name, sp.Name, sp.UUID, so.AttachedAvatar, m_scene.RegionInfo.RegionName);
563
564 return;
565 }
566
567 // Scripts MUST be snapshotted before the object is
568 // removed from the scene because doing otherwise will
569 // clobber the run flag
570 // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from
571 // scripts performing attachment operations at the same time. Getting object states stops the scripts.
572 string scriptedState = PrepareScriptInstanceForSave(so, true);
573
552 lock (sp.AttachmentsSyncLock) 574 lock (sp.AttachmentsSyncLock)
553 { 575 {
554 // Save avatar attachment information 576 // Save avatar attachment information
555// m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID); 577// m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID);
556 578
557 if (so.AttachedAvatar != sp.UUID)
558 {
559 m_log.WarnFormat(
560 "[ATTACHMENTS MODULE]: Tried to detach object {0} from {1} {2} but attached avatar id was {3} in {4}",
561 so.Name, sp.Name, sp.UUID, so.AttachedAvatar, m_scene.RegionInfo.RegionName);
562
563 return;
564 }
565
566 bool changed = sp.Appearance.DetachAttachment(so.FromItemID); 579 bool changed = sp.Appearance.DetachAttachment(so.FromItemID);
567 if (changed && m_scene.AvatarFactory != null) 580 if (changed && m_scene.AvatarFactory != null)
568 m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); 581 m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
569 582
570 DetachSingleAttachmentToInvInternal(sp, so); 583 sp.RemoveAttachment(so);
584 UpdateDetachedObject(sp, so, scriptedState);
571 } 585 }
572 } 586 }
573 587
@@ -777,8 +791,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
777 return newItem; 791 return newItem;
778 } 792 }
779 793
780 private string GetObjectScriptStates(SceneObjectGroup grp) 794 /// <summary>
795 /// Prepares the script instance for save.
796 /// </summary>
797 /// <remarks>
798 /// This involves triggering the detach event and getting the script state (which also stops the script)
799 /// This MUST be done outside sp.AttachmentsSyncLock, since otherwise there is a chance of deadlock if a
800 /// running script is performing attachment operations.
801 /// </remarks>
802 /// <returns>
803 /// The script state ready for persistence.
804 /// </returns>
805 /// <param name='grp'>
806 /// </param>
807 /// <param name='fireDetachEvent'>
808 /// If true, then fire the script event before we save its state.
809 /// </param>
810 private string PrepareScriptInstanceForSave(SceneObjectGroup grp, bool fireDetachEvent)
781 { 811 {
812 if (fireDetachEvent)
813 m_scene.EventManager.TriggerOnAttach(grp.LocalId, grp.FromItemID, UUID.Zero);
814
782 using (StringWriter sw = new StringWriter()) 815 using (StringWriter sw = new StringWriter())
783 { 816 {
784 using (XmlTextWriter writer = new XmlTextWriter(sw)) 817 using (XmlTextWriter writer = new XmlTextWriter(sw))
@@ -790,7 +823,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
790 } 823 }
791 } 824 }
792 825
793 private void UpdateDetachedObject(IScenePresence sp, SceneObjectGroup so) 826 private void UpdateDetachedObject(IScenePresence sp, SceneObjectGroup so, string scriptedState)
794 { 827 {
795 // Don't save attachments for HG visitors, it 828 // Don't save attachments for HG visitors, it
796 // messes up their inventory. When a HG visitor logs 829 // messes up their inventory. When a HG visitor logs
@@ -803,11 +836,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
803 && (m_scene.UserManagementModule == null 836 && (m_scene.UserManagementModule == null
804 || m_scene.UserManagementModule.IsLocalGridUser(sp.UUID)); 837 || m_scene.UserManagementModule.IsLocalGridUser(sp.UUID));
805 838
806 // Scripts MUST be snapshotted before the object is
807 // removed from the scene because doing otherwise will
808 // clobber the run flag
809 string scriptedState = GetObjectScriptStates(so);
810
811 // Remove the object from the scene so no more updates 839 // Remove the object from the scene so no more updates
812 // are sent. Doing this before the below changes will ensure 840 // are sent. Doing this before the below changes will ensure
813 // updates can't cause "HUD artefacts" 841 // updates can't cause "HUD artefacts"
@@ -831,97 +859,93 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
831 so.RemoveScriptInstances(true); 859 so.RemoveScriptInstances(true);
832 } 860 }
833 861
834 private void DetachSingleAttachmentToInvInternal(IScenePresence sp, SceneObjectGroup so)
835 {
836 // m_log.DebugFormat("[ATTACHMENTS MODULE]: Detaching item {0} to inventory for {1}", itemID, sp.Name);
837
838 m_scene.EventManager.TriggerOnAttach(so.LocalId, so.FromItemID, UUID.Zero);
839 sp.RemoveAttachment(so);
840
841 UpdateDetachedObject(sp, so);
842 }
843
844 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( 862 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
845 IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc) 863 IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc)
846 { 864 {
847 if (m_invAccessModule == null) 865 if (m_invAccessModule == null)
848 return null; 866 return null;
849 867
868 SceneObjectGroup objatt;
869
870 if (itemID != UUID.Zero)
871 objatt = m_invAccessModule.RezObject(sp.ControllingClient,
872 itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
873 false, false, sp.UUID, true);
874 else
875 objatt = m_invAccessModule.RezObject(sp.ControllingClient,
876 null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
877 false, false, sp.UUID, true);
878
879 if (objatt == null)
880 {
881 m_log.WarnFormat(
882 "[ATTACHMENTS MODULE]: Could not retrieve item {0} for attaching to avatar {1} at point {2}",
883 itemID, sp.Name, attachmentPt);
884
885 return null;
886 }
887
888 // Remove any previous attachments
889 List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
890 string previousAttachmentScriptedState = null;
891
892 // At the moment we can only deal with a single attachment
893 if (attachments.Count != 0)
894 DetachSingleAttachmentToInv(sp, attachments[0]);
895
850 lock (sp.AttachmentsSyncLock) 896 lock (sp.AttachmentsSyncLock)
851 { 897 {
852 SceneObjectGroup objatt;
853
854 if (itemID != UUID.Zero)
855 objatt = m_invAccessModule.RezObject(sp.ControllingClient,
856 itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
857 false, false, sp.UUID, true);
858 else
859 objatt = m_invAccessModule.RezObject(sp.ControllingClient,
860 null, assetID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
861 false, false, sp.UUID, true);
862
863 if (objatt != null)
864 {
865// m_log.DebugFormat( 898// m_log.DebugFormat(
866// "[ATTACHMENTS MODULE]: Rezzed single object {0} for attachment to {1} on point {2} in {3}", 899// "[ATTACHMENTS MODULE]: Rezzed single object {0} for attachment to {1} on point {2} in {3}",
867// objatt.Name, sp.Name, attachmentPt, m_scene.Name); 900// objatt.Name, sp.Name, attachmentPt, m_scene.Name);
868 901
869 // HasGroupChanged is being set from within RezObject. Ideally it would be set by the caller. 902 // HasGroupChanged is being set from within RezObject. Ideally it would be set by the caller.
870 objatt.HasGroupChanged = false; 903 objatt.HasGroupChanged = false;
871 bool tainted = false; 904 bool tainted = false;
872 if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint) 905 if (attachmentPt != 0 && attachmentPt != objatt.AttachmentPoint)
873 tainted = true; 906 tainted = true;
874 907
875 // FIXME: Detect whether it's really likely for AttachObject to throw an exception in the normal 908 // FIXME: Detect whether it's really likely for AttachObject to throw an exception in the normal
876 // course of events. If not, then it's probably not worth trying to recover the situation 909 // course of events. If not, then it's probably not worth trying to recover the situation
877 // since this is more likely to trigger further exceptions and confuse later debugging. If 910 // since this is more likely to trigger further exceptions and confuse later debugging. If
878 // exceptions can be thrown in expected error conditions (not NREs) then make this consistent 911 // exceptions can be thrown in expected error conditions (not NREs) then make this consistent
879 // since other normal error conditions will simply return false instead. 912 // since other normal error conditions will simply return false instead.
880 // This will throw if the attachment fails 913 // This will throw if the attachment fails
881 try 914 try
882 { 915 {
883 AttachObjectInternal(sp, objatt, attachmentPt, false, false, false); 916 AttachObjectInternal(sp, objatt, attachmentPt, false, false, false);
884 } 917 }
885 catch (Exception e) 918 catch (Exception e)
886 { 919 {
887 m_log.ErrorFormat( 920 m_log.ErrorFormat(
888 "[ATTACHMENTS MODULE]: Failed to attach {0} {1} for {2}, exception {3}{4}", 921 "[ATTACHMENTS MODULE]: Failed to attach {0} {1} for {2}, exception {3}{4}",
889 objatt.Name, objatt.UUID, sp.Name, e.Message, e.StackTrace); 922 objatt.Name, objatt.UUID, sp.Name, e.Message, e.StackTrace);
890
891 // Make sure the object doesn't stick around and bail
892 sp.RemoveAttachment(objatt);
893 m_scene.DeleteSceneObject(objatt, false);
894 return null;
895 }
896
897 if (tainted)
898 objatt.HasGroupChanged = true;
899
900 if (doc != null)
901 {
902 objatt.LoadScriptState(doc);
903 objatt.ResetOwnerChangeFlag();
904 }
905 923
906 // Fire after attach, so we don't get messy perms dialogs 924 // Make sure the object doesn't stick around and bail
907 // 4 == AttachedRez 925 sp.RemoveAttachment(objatt);
908 objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4); 926 m_scene.DeleteSceneObject(objatt, false);
909 objatt.ResumeScripts(); 927 return null;
928 }
910 929
911 // Do this last so that event listeners have access to all the effects of the attachment 930 if (tainted)
912 m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID); 931 objatt.HasGroupChanged = true;
913 932
914 return objatt; 933 if (doc != null)
915 }
916 else
917 { 934 {
918 m_log.WarnFormat( 935 objatt.LoadScriptState(doc);
919 "[ATTACHMENTS MODULE]: Could not retrieve item {0} for attaching to avatar {1} at point {2}", 936 objatt.ResetOwnerChangeFlag();
920 itemID, sp.Name, attachmentPt);
921 } 937 }
938
939 // Fire after attach, so we don't get messy perms dialogs
940 // 4 == AttachedRez
941 objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
942 objatt.ResumeScripts();
943
944 // Do this last so that event listeners have access to all the effects of the attachment
945 m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, sp.UUID);
946
947 return objatt;
922 } 948 }
923
924 return null;
925 } 949 }
926 950
927 /// <summary> 951 /// <summary>
@@ -1079,17 +1103,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1079 ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId); 1103 ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
1080 if (sp != null) 1104 if (sp != null)
1081 { 1105 {
1082 lock (sp.AttachmentsSyncLock) 1106 List<SceneObjectGroup> attachments = sp.GetAttachments();
1107
1108 foreach (SceneObjectGroup group in attachments)
1083 { 1109 {
1084 List<SceneObjectGroup> attachments = sp.GetAttachments(); 1110 if (group.FromItemID == itemID && group.FromItemID != UUID.Zero)
1085
1086 foreach (SceneObjectGroup group in attachments)
1087 { 1111 {
1088 if (group.FromItemID == itemID && group.FromItemID != UUID.Zero) 1112 DetachSingleAttachmentToInv(sp, group);
1089 { 1113 return;
1090 DetachSingleAttachmentToInv(sp, group);
1091 return;
1092 }
1093 } 1114 }
1094 } 1115 }
1095 } 1116 }
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index 4c9ee06..64feec1 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -414,8 +414,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
414 } 414 }
415 private void RegisterStatsManagerRegionStatistics() 415 private void RegisterStatsManagerRegionStatistics()
416 { 416 {
417 string regionName = m_scene.RegionInfo.RegionName;
418
419 MakeStat("RootAgents", "avatars", (s) => { s.Value = m_scene.SceneGraph.GetRootAgentCount(); }); 417 MakeStat("RootAgents", "avatars", (s) => { s.Value = m_scene.SceneGraph.GetRootAgentCount(); });
420 MakeStat("ChildAgents", "avatars", (s) => { s.Value = m_scene.SceneGraph.GetChildAgentCount(); }); 418 MakeStat("ChildAgents", "avatars", (s) => { s.Value = m_scene.SceneGraph.GetChildAgentCount(); });
421 MakeStat("TotalPrims", "objects", (s) => { s.Value = m_scene.SceneGraph.GetTotalObjectsCount(); }); 419 MakeStat("TotalPrims", "objects", (s) => { s.Value = m_scene.SceneGraph.GetTotalObjectsCount(); });
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b03fee0..d459b56 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -956,7 +956,12 @@ namespace OpenSim.Region.Framework.Scenes
956 } 956 }
957 } 957 }
958 958
959 string grant = startupConfig.GetString("AllowedClients", String.Empty); 959 string[] possibleAccessControlConfigSections = new string[] { "AccessControl", "Startup" };
960
961 string grant
962 = Util.GetConfigVarFromSections<string>(
963 config, "AllowedClients", possibleAccessControlConfigSections, "");
964
960 if (grant.Length > 0) 965 if (grant.Length > 0)
961 { 966 {
962 foreach (string viewer in grant.Split(',')) 967 foreach (string viewer in grant.Split(','))
@@ -965,7 +970,10 @@ namespace OpenSim.Region.Framework.Scenes
965 } 970 }
966 } 971 }
967 972
968 grant = startupConfig.GetString("BannedClients", String.Empty); 973 grant
974 = Util.GetConfigVarFromSections<string>(
975 config, "BannedClients", possibleAccessControlConfigSections, "");
976
969 if (grant.Length > 0) 977 if (grant.Length > 0)
970 { 978 {
971 foreach (string viewer in grant.Split(',')) 979 foreach (string viewer in grant.Split(','))
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index 17971e3..e9ddbbe 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
76 76
77 if (m_console != null) 77 if (m_console != null)
78 { 78 {
79 m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); 79 m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner or estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms);
80 } 80 }
81 } 81 }
82 else 82 else
diff --git a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
index 112ba4e..5bf0ed4 100644
--- a/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
45 public class WebSocketEchoModule : ISharedRegionModule 45 public class WebSocketEchoModule : ISharedRegionModule
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
48 private bool enabled; 49 private bool enabled;
49 public string Name { get { return "WebSocketEchoModule"; } } 50 public string Name { get { return "WebSocketEchoModule"; } }
50 51
@@ -55,9 +56,9 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
55 56
56 public void Initialise(IConfigSource pConfig) 57 public void Initialise(IConfigSource pConfig)
57 { 58 {
58 enabled =(pConfig.Configs["WebSocketEcho"] != null); 59 enabled = (pConfig.Configs["WebSocketEcho"] != null);
59 if (enabled) 60// if (enabled)
60 m_log.DebugFormat("[WebSocketEchoModule]: INITIALIZED MODULE"); 61// m_log.DebugFormat("[WebSocketEchoModule]: INITIALIZED MODULE");
61 } 62 }
62 63
63 /// <summary> 64 /// <summary>
@@ -158,17 +159,17 @@ namespace OpenSim.Region.OptionalModules.WebSocketEchoModule
158 159
159 public void AddRegion(Scene scene) 160 public void AddRegion(Scene scene)
160 { 161 {
161 m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName); 162// m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
162 } 163 }
163 164
164 public void RemoveRegion(Scene scene) 165 public void RemoveRegion(Scene scene)
165 { 166 {
166 m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName); 167// m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
167 } 168 }
168 169
169 public void RegionLoaded(Scene scene) 170 public void RegionLoaded(Scene scene)
170 { 171 {
171 m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName); 172// m_log.DebugFormat("[WebSocketEchoModule]: REGION {0} LOADED", scene.RegionInfo.RegionName);
172 } 173 }
173 } 174 }
174} \ No newline at end of file 175} \ No newline at end of file
generated by cgit v1.1 at 2024-10-28 23:46:20 +0000