diff options
author | BlueWall | 2012-10-03 19:14:40 -0400 |
---|---|---|
committer | BlueWall | 2012-10-03 19:14:40 -0400 |
commit | e6c9b0900615ac41d56f1fbd3ea30a6308b22f96 (patch) | |
tree | 7cc9f82783ef8826a13e169a9d43ef9ec5d98cfc /OpenSim/Region/Framework | |
parent | Add modular configuration for Robust connectors (diff) | |
parent | Soliciting for comments on smoothness of physics objects for this build. (diff) | |
download | opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.zip opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.gz opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.bz2 opensim-SC_OLD-e6c9b0900615ac41d56f1fbd3ea30a6308b22f96.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim into modular_config
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 8155eab..620ec22 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -109,6 +109,15 @@ namespace OpenSim.Region.Framework.Interfaces | |||
109 | void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID); | 109 | void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID); |
110 | 110 | ||
111 | /// <summary> | 111 | /// <summary> |
112 | /// Detach the given item to the ground at the specified coordinates & rotation | ||
113 | /// </summary> | ||
114 | /// <param name="sp"></param> | ||
115 | /// <param name="objectLocalID"></param> | ||
116 | /// <param name="absolutePos"></param> | ||
117 | /// <param name="absoluteRot"></param> | ||
118 | void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID, Vector3 absolutePos, Quaternion absoluteRot); | ||
119 | |||
120 | /// <summary> | ||
112 | /// Detach the given attachment so that it remains in the user's inventory. | 121 | /// Detach the given attachment so that it remains in the user's inventory. |
113 | /// </summary> | 122 | /// </summary> |
114 | /// <param name="sp">/param> | 123 | /// <param name="sp">/param> |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2e03874..0a4aa4a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5545,6 +5545,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5545 | 5545 | ||
5546 | public void StoreExtraSetting(string name, string val) | 5546 | public void StoreExtraSetting(string name, string val) |
5547 | { | 5547 | { |
5548 | if (m_extraSettings == null) | ||
5549 | return; | ||
5550 | |||
5548 | string oldVal; | 5551 | string oldVal; |
5549 | 5552 | ||
5550 | if (m_extraSettings.TryGetValue(name, out oldVal)) | 5553 | if (m_extraSettings.TryGetValue(name, out oldVal)) |
@@ -5562,6 +5565,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5562 | 5565 | ||
5563 | public void RemoveExtraSetting(string name) | 5566 | public void RemoveExtraSetting(string name) |
5564 | { | 5567 | { |
5568 | if (m_extraSettings == null) | ||
5569 | return; | ||
5570 | |||
5565 | if (!m_extraSettings.ContainsKey(name)) | 5571 | if (!m_extraSettings.ContainsKey(name)) |
5566 | return; | 5572 | return; |
5567 | 5573 | ||