aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/IUserGridData.cs50
-rw-r--r--OpenSim/Data/MySQL/MySQLGenericTableHandler.cs3
-rw-r--r--OpenSim/Data/MySQL/MySQLUserGridData.cs64
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs216
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs139
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs61
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs89
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs86
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
-rw-r--r--OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs38
-rw-r--r--OpenSim/Services/Interfaces/IUserGridService.cs75
-rw-r--r--OpenSim/Services/UserAccountService/UserGridService.cs76
-rw-r--r--OpenSim/Services/UserAccountService/UserGridServiceBase.cs82
14 files changed, 818 insertions, 177 deletions
diff --git a/OpenSim/Data/IUserGridData.cs b/OpenSim/Data/IUserGridData.cs
new file mode 100644
index 0000000..6f7467e
--- /dev/null
+++ b/OpenSim/Data/IUserGridData.cs
@@ -0,0 +1,50 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using OpenMetaverse;
31using OpenSim.Framework;
32
33namespace OpenSim.Data
34{
35 // This MUST be a ref type!
36 public class UserGridData
37 {
38 public string UserID;
39 public Dictionary<string, string> Data;
40 }
41
42 /// <summary>
43 /// An interface for connecting to the user grid datastore
44 /// </summary>
45 public interface IUserGridData
46 {
47 UserGridData GetUserGridData(string userID);
48 bool StoreUserGridData(UserGridData data);
49 }
50} \ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index b170dde..756b42d 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -197,8 +197,7 @@ namespace OpenSim.Data.MySQL
197 public virtual T[] Get(string where) 197 public virtual T[] Get(string where)
198 { 198 {
199 using (MySqlCommand cmd = new MySqlCommand()) 199 using (MySqlCommand cmd = new MySqlCommand())
200 { 200 {
201
202 string query = String.Format("select * from {0} where {1}", 201 string query = String.Format("select * from {0} where {1}",
203 m_Realm, where); 202 m_Realm, where);
204 203
diff --git a/OpenSim/Data/MySQL/MySQLUserGridData.cs b/OpenSim/Data/MySQL/MySQLUserGridData.cs
new file mode 100644
index 0000000..7209b18
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLUserGridData.cs
@@ -0,0 +1,64 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Data;
31using System.Reflection;
32using System.Threading;
33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework;
36using MySql.Data.MySqlClient;
37
38namespace OpenSim.Data.MySQL
39{
40 /// <summary>
41 /// A MySQL Interface for user grid data
42 /// </summary>
43 public class MySQLUserGridData : MySQLGenericTableHandler<UserGridData>, IUserGridData
44 {
45// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46
47 public MySQLUserGridData(string connectionString, string realm) : base(connectionString, realm, "UserGrid") {}
48
49 public UserGridData GetUserGridData(string userID)
50 {
51 UserGridData[] ret = Get("UserID", userID);
52
53 if (ret.Length == 0)
54 return null;
55
56 return ret[0];
57 }
58
59 public bool StoreUserGridData(UserGridData data)
60 {
61 return Store(data);
62 }
63 }
64} \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
new file mode 100644
index 0000000..530a21c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -0,0 +1,216 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using log4net;
30using Nini.Config;
31using OpenMetaverse;
32using OpenSim.Framework;
33using OpenSim.Region.Framework;
34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes;
36
37namespace OpenSim.Region.CoreModules.Avatar.Attachments
38{
39 public class AttachmentsModule : IAttachmentsModule, IRegionModule
40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42
43 protected Scene m_scene = null;
44
45 public void Initialise(Scene scene, IConfigSource source)
46 {
47 scene.RegisterModuleInterface<IAttachmentsModule>(this);
48 m_scene = scene;
49 }
50
51 public void PostInitialise()
52 {
53 }
54
55 public void Close()
56 {
57 }
58
59 public string Name
60 {
61 get { return "Attachments Module"; }
62 }
63
64 public bool IsSharedModule
65 {
66 get { return false; }
67 }
68
69 public bool AttachObject(
70 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
71 {
72 SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
73 if (group != null)
74 {
75 if (m_scene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
76 {
77 // If the attachment point isn't the same as the one previously used
78 // set it's offset position = 0 so that it appears on the attachment point
79 // and not in a weird location somewhere unknown.
80 if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
81 {
82 attachPos = Vector3.Zero;
83 }
84
85 // AttachmentPt 0 means the client chose to 'wear' the attachment.
86 if (AttachmentPt == 0)
87 {
88 // Check object for stored attachment point
89 AttachmentPt = (uint)group.GetAttachmentPoint();
90 }
91
92 // if we still didn't find a suitable attachment point.......
93 if (AttachmentPt == 0)
94 {
95 // Stick it on left hand with Zero Offset from the attachment point.
96 AttachmentPt = (uint)AttachmentPoint.LeftHand;
97 attachPos = Vector3.Zero;
98 }
99
100 group.SetAttachmentPoint((byte)AttachmentPt);
101 group.AbsolutePosition = attachPos;
102
103 // Saves and gets itemID
104 UUID itemId;
105
106 if (group.GetFromItemID() == UUID.Zero)
107 {
108 m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
109 }
110 else
111 {
112 itemId = group.GetFromItemID();
113 }
114
115 SetAttachmentInventoryStatus(remoteClient, AttachmentPt, itemId, group);
116
117 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
118
119 // In case it is later dropped again, don't let
120 // it get cleaned up
121 group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
122 group.HasGroupChanged = false;
123 }
124 else
125 {
126 remoteClient.SendAgentAlertMessage(
127 "You don't have sufficient permissions to attach this object", false);
128
129 return false;
130 }
131 }
132 else
133 {
134 m_log.DebugFormat("[SCENE GRAPH]: AttachObject found no such scene object {0}", objectLocalID);
135 return false;
136 }
137
138 return true;
139 }
140
141 /// <summary>
142 /// Update the user inventory to reflect an attachment
143 /// </summary>
144 /// <param name="att"></param>
145 /// <param name="remoteClient"></param>
146 /// <param name="itemID"></param>
147 /// <param name="AttachmentPt"></param>
148 /// <returns></returns>
149 public UUID SetAttachmentInventoryStatus(
150 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
151 {
152 m_log.DebugFormat(
153 "[USER INVENTORY]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
154 remoteClient.Name, att.Name, itemID);
155
156 if (!att.IsDeleted)
157 AttachmentPt = att.RootPart.AttachmentPoint;
158
159 ScenePresence presence;
160 if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
161 {
162 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
163 item = m_scene.InventoryService.GetItem(item);
164
165 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
166 }
167
168 return att.UUID;
169 }
170
171 /// <summary>
172 /// Update the user inventory to reflect an attachment
173 /// </summary>
174 /// <param name="remoteClient"></param>
175 /// <param name="AttachmentPt"></param>
176 /// <param name="itemID"></param>
177 /// <param name="att"></param>
178 public void SetAttachmentInventoryStatus(
179 IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
180 {
181// m_log.DebugFormat(
182// "[USER INVENTORY]: Updating attachment {0} for {1} at {2} using item ID {3}",
183// att.Name, remoteClient.Name, AttachmentPt, itemID);
184
185 if (UUID.Zero == itemID)
186 {
187 m_log.Error("[SCENE INVENTORY]: Unable to save attachment. Error inventory item ID.");
188 return;
189 }
190
191 if (0 == AttachmentPt)
192 {
193 m_log.Error("[SCENE INVENTORY]: Unable to save attachment. Error attachment point.");
194 return;
195 }
196
197 if (null == att.RootPart)
198 {
199 m_log.Error("[SCENE INVENTORY]: Unable to save attachment for a prim without the rootpart!");
200 return;
201 }
202
203 ScenePresence presence;
204 if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
205 {
206 // XXYY!!
207 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
208 item = m_scene.InventoryService.GetItem(item);
209 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
210
211 if (m_scene.AvatarFactory != null)
212 m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
213 }
214 }
215 }
216} \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs
new file mode 100644
index 0000000..f4309fe
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserGrid/LocalUserGridServiceConnector.cs
@@ -0,0 +1,139 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
32using Nini.Config;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Server.Base;
36using OpenSim.Services.Interfaces;
37
38using OpenMetaverse;
39
40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserGrid
41{
42 public class LocalUserGridServicesConnector : ISharedRegionModule, IUserGridService
43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
46 private IUserGridService m_service;
47
48 private bool m_Enabled = false;
49
50 public Type ReplaceableInterface
51 {
52 get { return null; }
53 }
54
55 public string Name
56 {
57 get { return "LocalUserGridServicesConnector"; }
58 }
59
60 public void Initialise(IConfigSource source)
61 {
62 IConfig moduleConfig = source.Configs["Modules"];
63 if (moduleConfig != null)
64 {
65 string name = moduleConfig.GetString("UserGridServices", "");
66 if (name == Name)
67 {
68 IConfig userConfig = source.Configs["UserGridService"];
69 if (userConfig == null)
70 {
71 m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: UserGridService missing from ini files");
72 return;
73 }
74
75 string serviceDll = userConfig.GetString("LocalServiceModule", String.Empty);
76
77 if (serviceDll == String.Empty)
78 {
79 m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: No LocalServiceModule named in section UserGridService");
80 return;
81 }
82
83 Object[] args = new Object[] { source };
84 m_service = ServerUtils.LoadPlugin<IUserGridService>(serviceDll, args);
85
86 if (m_service == null)
87 {
88 m_log.Error("[LOCAL USER GRID SERVICE CONNECTOR]: Can't load UserGrid service");
89 return;
90 }
91 m_Enabled = true;
92 m_log.Info("[LOCAL USER GRID SERVICE CONNECTOR]: Local UserGrid connector enabled");
93 }
94 }
95 }
96
97 public void PostInitialise()
98 {
99 if (!m_Enabled)
100 return;
101 }
102
103 public void Close()
104 {
105 if (!m_Enabled)
106 return;
107 }
108
109 public void AddRegion(Scene scene)
110 {
111 if (!m_Enabled)
112 return;
113
114 scene.RegisterModuleInterface<IUserGridService>(m_service);
115 }
116
117 public void RemoveRegion(Scene scene)
118 {
119 if (!m_Enabled)
120 return;
121 }
122
123 public void RegionLoaded(Scene scene)
124 {
125 if (!m_Enabled)
126 return;
127 }
128
129 public UserGridInfo GetUserGridInfo(string userID)
130 {
131 return m_service.GetUserGridInfo(userID);
132 }
133
134 public bool StoreUserGridInfo(UserGridInfo info)
135 {
136 return m_service.StoreUserGridInfo(info);
137 }
138 }
139} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
new file mode 100644
index 0000000..5e5df4b
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -0,0 +1,61 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenMetaverse;
30using OpenSim.Framework;
31using OpenSim.Region.Framework.Scenes;
32
33namespace OpenSim.Region.Framework.Interfaces
34{
35 public interface IAttachmentsModule
36 {
37 /// <summary>
38 /// Attach an object to an avatar.
39 /// </summary>
40 /// <param name="controllingClient"></param>
41 /// <param name="localID"></param>
42 /// <param name="attachPoint"></param>
43 /// <param name="rot"></param>
44 /// <param name="pos"></param>
45 /// <param name="silent"></param>
46 /// <returns>true if the object was successfully attached, false otherwise</returns>
47 bool AttachObject(
48 IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent);
49
50 /// <summary>
51 /// Update the user inventory to the attachment of an item
52 /// </summary>
53 /// <param name="att"></param>
54 /// <param name="remoteClient"></param>
55 /// <param name="itemID"></param>
56 /// <param name="AttachmentPt"></param>
57 /// <returns></returns>
58 UUID SetAttachmentInventoryStatus(
59 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
60 }
61} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5f3cd8c..bd3b433 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1862,35 +1862,7 @@ namespace OpenSim.Region.Framework.Scenes
1862 return UUID.Zero; 1862 return UUID.Zero;
1863 } 1863 }
1864 1864
1865 return RezSingleAttachment(att, remoteClient, itemID, AttachmentPt); 1865 return AttachmentsModule.SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt);
1866 }
1867
1868 /// <summary>
1869 /// Update the user inventory to reflect an attachment
1870 /// </summary>
1871 /// <param name="att"></param>
1872 /// <param name="remoteClient"></param>
1873 /// <param name="itemID"></param>
1874 /// <param name="AttachmentPt"></param>
1875 /// <returns></returns>
1876 public UUID RezSingleAttachment(SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
1877 {
1878 m_log.DebugFormat(
1879 "[USER INVENTORY]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
1880 remoteClient.Name, att.Name, itemID);
1881
1882 if (!att.IsDeleted)
1883 AttachmentPt = att.RootPart.AttachmentPoint;
1884
1885 ScenePresence presence;
1886 if (TryGetAvatar(remoteClient.AgentId, out presence))
1887 {
1888 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1889 item = InventoryService.GetItem(item);
1890
1891 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
1892 }
1893 return att.UUID;
1894 } 1866 }
1895 1867
1896 public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, 1868 public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
@@ -1902,65 +1874,6 @@ namespace OpenSim.Region.Framework.Scenes
1902 } 1874 }
1903 } 1875 }
1904 1876
1905 /// <summary>
1906 /// Attach an object.
1907 /// </summary>
1908 /// <param name="controllingClient"></param>
1909 /// <param name="localID"></param>
1910 /// <param name="attachPoint"></param>
1911 /// <param name="rot"></param>
1912 /// <param name="pos"></param>
1913 /// <param name="silent"></param>
1914 /// <returns>true if the object was successfully attached, false otherwise</returns>
1915 public bool AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent)
1916 {
1917 return m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent);
1918 }
1919
1920 /// <summary>
1921 /// This registers the item as attached in a user's inventory
1922 /// </summary>
1923 /// <param name="remoteClient"></param>
1924 /// <param name="AttachmentPt"></param>
1925 /// <param name="itemID"></param>
1926 /// <param name="att"></param>
1927 public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
1928 {
1929// m_log.DebugFormat(
1930// "[USER INVENTORY]: Updating attachment {0} for {1} at {2} using item ID {3}",
1931// att.Name, remoteClient.Name, AttachmentPt, itemID);
1932
1933 if (UUID.Zero == itemID)
1934 {
1935 m_log.Error("[SCENE INVENTORY]: Unable to save attachment. Error inventory item ID.");
1936 return;
1937 }
1938
1939 if (0 == AttachmentPt)
1940 {
1941 m_log.Error("[SCENE INVENTORY]: Unable to save attachment. Error attachment point.");
1942 return;
1943 }
1944
1945 if (null == att.RootPart)
1946 {
1947 m_log.Error("[SCENE INVENTORY]: Unable to save attachment for a prim without the rootpart!");
1948 return;
1949 }
1950
1951 ScenePresence presence;
1952 if (TryGetAvatar(remoteClient.AgentId, out presence))
1953 {
1954 // XXYY!!
1955 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1956 item = InventoryService.GetItem(item);
1957 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
1958
1959 if (m_AvatarFactory != null)
1960 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
1961 }
1962 }
1963
1964 public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) 1877 public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient)
1965 { 1878 {
1966 SceneObjectPart part = GetSceneObjectPart(itemID); 1879 SceneObjectPart part = GetSceneObjectPart(itemID);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a880fe7..c83132f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -307,6 +307,7 @@ namespace OpenSim.Region.Framework.Scenes
307 307
308 protected IXMLRPC m_xmlrpcModule; 308 protected IXMLRPC m_xmlrpcModule;
309 protected IWorldComm m_worldCommModule; 309 protected IWorldComm m_worldCommModule;
310 public IAttachmentsModule AttachmentsModule { get; set; }
310 protected IAvatarFactory m_AvatarFactory; 311 protected IAvatarFactory m_AvatarFactory;
311 public IAvatarFactory AvatarFactory 312 public IAvatarFactory AvatarFactory
312 { 313 {
@@ -1215,6 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes
1215 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 1216 m_worldCommModule = RequestModuleInterface<IWorldComm>();
1216 XferManager = RequestModuleInterface<IXfer>(); 1217 XferManager = RequestModuleInterface<IXfer>();
1217 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); 1218 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
1219 AttachmentsModule = RequestModuleInterface<IAttachmentsModule>();
1218 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); 1220 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
1219 m_dialogModule = RequestModuleInterface<IDialogModule>(); 1221 m_dialogModule = RequestModuleInterface<IDialogModule>();
1220 m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); 1222 m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
@@ -2405,9 +2407,11 @@ namespace OpenSim.Region.Framework.Scenes
2405 //grp.SetFromAssetID(grp.RootPart.LastOwnerID); 2407 //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
2406 m_log.DebugFormat( 2408 m_log.DebugFormat(
2407 "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); 2409 "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
2410
2411 if (AttachmentsModule != null)
2412 AttachmentsModule.AttachObject(
2413 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
2408 2414
2409 AttachObject(
2410 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
2411 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2415 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2412 grp.SendGroupFullUpdate(); 2416 grp.SendGroupFullUpdate();
2413 } 2417 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 22613e9..48744d7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -504,7 +504,7 @@ namespace OpenSim.Region.Framework.Scenes
504 return; 504 return;
505 505
506 // Calls attach with a Zero position 506 // Calls attach with a Zero position
507 if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false)) 507 if (m_parentScene.AttachmentsModule.AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
508 { 508 {
509 m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); 509 m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
510 510
@@ -547,8 +547,10 @@ namespace OpenSim.Region.Framework.Scenes
547 if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint()) 547 if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
548 tainted = true; 548 tainted = true;
549 549
550 AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false); 550 m_parentScene.AttachmentsModule.AttachObject(
551 remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false);
551 //objatt.ScheduleGroupForFullUpdate(); 552 //objatt.ScheduleGroupForFullUpdate();
553
552 if (tainted) 554 if (tainted)
553 objatt.HasGroupChanged = true; 555 objatt.HasGroupChanged = true;
554 556
@@ -605,86 +607,6 @@ namespace OpenSim.Region.Framework.Scenes
605 } 607 }
606 } 608 }
607 609
608 /// <summary>
609 /// Attach a scene object to an avatar.
610 /// </summary>
611 /// <param name="remoteClient"></param>
612 /// <param name="objectLocalID"></param>
613 /// <param name="AttachmentPt"></param>
614 /// <param name="rot"></param>
615 /// <param name="attachPos"></param>
616 /// <param name="silent"></param>
617 /// <returns>true if the attachment was successful, false otherwise</returns>
618 protected internal bool AttachObject(
619 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
620 {
621 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
622 if (group != null)
623 {
624 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
625 {
626 // If the attachment point isn't the same as the one previously used
627 // set it's offset position = 0 so that it appears on the attachment point
628 // and not in a weird location somewhere unknown.
629 if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
630 {
631 attachPos = Vector3.Zero;
632 }
633
634 // AttachmentPt 0 means the client chose to 'wear' the attachment.
635 if (AttachmentPt == 0)
636 {
637 // Check object for stored attachment point
638 AttachmentPt = (uint)group.GetAttachmentPoint();
639 }
640
641 // if we still didn't find a suitable attachment point.......
642 if (AttachmentPt == 0)
643 {
644 // Stick it on left hand with Zero Offset from the attachment point.
645 AttachmentPt = (uint)AttachmentPoint.LeftHand;
646 attachPos = Vector3.Zero;
647 }
648
649 group.SetAttachmentPoint((byte)AttachmentPt);
650 group.AbsolutePosition = attachPos;
651
652 // Saves and gets itemID
653 UUID itemId;
654
655 if (group.GetFromItemID() == UUID.Zero)
656 {
657 m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
658 }
659 else
660 {
661 itemId = group.GetFromItemID();
662 }
663
664 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
665
666 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
667 // In case it is later dropped again, don't let
668 // it get cleaned up
669 //
670 group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
671 group.HasGroupChanged = false;
672 }
673 else
674 {
675 remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false);
676 return false;
677 }
678 }
679 else
680 {
681 m_log.DebugFormat("[SCENE GRAPH]: AttachObject found no such scene object {0}", objectLocalID);
682 return false;
683 }
684
685 return true;
686 }
687
688 protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance) 610 protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance)
689 { 611 {
690 ScenePresence newAvatar = null; 612 ScenePresence newAvatar = null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0134b03..0eee147 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2896,9 +2896,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2896 2896
2897 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 2897 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
2898 2898
2899 m_ScriptEngine.World.AttachObject(presence.ControllingClient, 2899 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
2900 grp.LocalId, (uint)attachment, Quaternion.Identity, 2900 if (attachmentsModule != null)
2901 Vector3.Zero, false); 2901 attachmentsModule.AttachObject(
2902 presence.ControllingClient, grp.LocalId,
2903 (uint)attachment, Quaternion.Identity, Vector3.Zero, false);
2902 } 2904 }
2903 } 2905 }
2904 2906
diff --git a/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs b/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs
new file mode 100644
index 0000000..3aa8940
--- /dev/null
+++ b/OpenSim/Services/Connectors/UserGrid/UserGridServiceConnector.cs
@@ -0,0 +1,38 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29
30namespace OpenSim.Services.Connectors
31{
32 public class UserGridServiceConnector
33 {
34 public UserGridServiceConnector()
35 {
36 }
37 }
38}
diff --git a/OpenSim/Services/Interfaces/IUserGridService.cs b/OpenSim/Services/Interfaces/IUserGridService.cs
new file mode 100644
index 0000000..50134e0
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IUserGridService.cs
@@ -0,0 +1,75 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using OpenMetaverse;
31
32namespace OpenSim.Services.Interfaces
33{
34 /// <summary>
35 /// Records user information specific to a grid but which is not part of a user's account.
36 /// </summary>
37 public class UserGridInfo
38 {
39 public string UserID;
40 public UUID HomeRegionID;
41 public Vector3 HomePosition;
42 public Vector3 HomeLookAt;
43
44 public UserGridInfo() {}
45
46 public UserGridInfo(Dictionary<string, object> kvp)
47 {
48 if (kvp.ContainsKey("UserID"))
49 UserID = kvp["UserID"].ToString();
50 if (kvp.ContainsKey("HomeRegionID"))
51 UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID);
52 if (kvp.ContainsKey("HomePosition"))
53 Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition);
54 if (kvp.ContainsKey("HomeLookAt"))
55 Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
56 }
57
58 public Dictionary<string, object> ToKeyValuePairs()
59 {
60 Dictionary<string, object> result = new Dictionary<string, object>();
61 result["UserID"] = UserID;
62 result["HomeRegionID"] = HomeRegionID.ToString();
63 result["HomePosition"] = HomePosition.ToString();
64 result["HomeLookAt"] = HomeLookAt.ToString();
65
66 return result;
67 }
68 }
69
70 public interface IUserGridService
71 {
72 UserGridInfo GetUserGridInfo(string userID);
73 bool StoreUserGridInfo(UserGridInfo info);
74 }
75} \ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserGridService.cs b/OpenSim/Services/UserAccountService/UserGridService.cs
new file mode 100644
index 0000000..2d28b33
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserGridService.cs
@@ -0,0 +1,76 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using Nini.Config;
32using OpenSim.Data;
33using OpenSim.Services.Interfaces;
34using OpenSim.Framework.Console;
35using GridRegion = OpenSim.Services.Interfaces.GridRegion;
36
37using OpenMetaverse;
38using log4net;
39
40namespace OpenSim.Services.UserAccountService
41{
42 public class UserGridService : UserGridServiceBase, IUserGridService
43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
46 public UserGridService(IConfigSource config) : base(config)
47 {
48 m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
49 }
50
51 public UserGridInfo GetUserGridInfo(string userID)
52 {
53 UserGridData d = m_Database.GetUserGridData(userID);
54
55 UserGridInfo info = new UserGridInfo();
56 info.UserID = d.UserID;
57 info.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
58 info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
59 info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
60
61 return info;
62 }
63
64 public bool StoreUserGridInfo(UserGridInfo info)
65 {
66 UserGridData d = new UserGridData();
67
68 d.Data["UserID"] = info.UserID;
69 d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
70 d.Data["HomePosition"] = info.HomePosition.ToString();
71 d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
72
73 return m_Database.StoreUserGridData(d);
74 }
75 }
76} \ No newline at end of file
diff --git a/OpenSim/Services/UserAccountService/UserGridServiceBase.cs b/OpenSim/Services/UserAccountService/UserGridServiceBase.cs
new file mode 100644
index 0000000..80aaa49
--- /dev/null
+++ b/OpenSim/Services/UserAccountService/UserGridServiceBase.cs
@@ -0,0 +1,82 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Reflection;
30using Nini.Config;
31using OpenSim.Framework;
32using OpenSim.Data;
33using OpenSim.Services.Interfaces;
34using OpenSim.Services.Base;
35
36namespace OpenSim.Services.UserAccountService
37{
38 public class UserGridServiceBase : ServiceBase
39 {
40 protected IUserGridData m_Database = null;
41
42 public UserGridServiceBase(IConfigSource config) : base(config)
43 {
44 string dllName = String.Empty;
45 string connString = String.Empty;
46 string realm = "UserGrid";
47
48 //
49 // Try reading the [DatabaseService] section, if it exists
50 //
51 IConfig dbConfig = config.Configs["DatabaseService"];
52 if (dbConfig != null)
53 {
54 if (dllName == String.Empty)
55 dllName = dbConfig.GetString("StorageProvider", String.Empty);
56 if (connString == String.Empty)
57 connString = dbConfig.GetString("ConnectionString", String.Empty);
58 }
59
60 //
61 // [PresenceService] section overrides [DatabaseService], if it exists
62 //
63 IConfig presenceConfig = config.Configs["PresenceService"];
64 if (presenceConfig != null)
65 {
66 dllName = presenceConfig.GetString("StorageProvider", dllName);
67 connString = presenceConfig.GetString("ConnectionString", connString);
68 realm = presenceConfig.GetString("Realm", realm);
69 }
70
71 //
72 // We tried, but this doesn't exist. We can't proceed.
73 //
74 if (dllName.Equals(String.Empty))
75 throw new Exception("No StorageProvider configured");
76
77 m_Database = LoadPlugin<IUserGridData>(dllName, new Object[] { connString, realm });
78 if (m_Database == null)
79 throw new Exception("Could not find a storage interface in the given module " + dllName);
80 }
81 }
82} \ No newline at end of file