* Refactored Environment/Modules directory - modules now reside in their own directory with any associated module-specific classes.

* Each module directory is currently inside one of the following category folders: Agent (Anything relating to do with Client<->Server communications.), Avatar (Anything to do with the avatar or presence inworld), Framework (Classes modules can use), Grid (Grid traffic, new OGS2 grid comms), Scripting (Scripting functions, etc), World (The enrivonment/scene, IE Sun/Tree modules.) * This should be moved into a seperate project file.
author: Adam Frisby 2008-04-30 21:16:36 +0000
committer: Adam Frisby 2008-04-30 21:16:36 +0000
commit: f5c312bc3c2567449c7268a54a08a54119f58d53 (patch)
tree: 424668a4bbec6873ebc5b8256f3671db102f5e9c /OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
parent: * Adds the AuthbuyerID field to sqlite and makes use of it. (diff)
download: opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.zip
opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.tar.gz
opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.tar.bz2
opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.tar.xz
1 files changed, 129 insertions, 129 deletions
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index 44b3f8b..f8b14d3 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -1,129 +1,129 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
+ *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using libsecondlife;
+using libsecondlife;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Environment.Scenes;
-namespace OpenSim.Region.Environment.Modules
+namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
-{
+{
-    public class AvatarProfilesModule : IRegionModule
+    public class AvatarProfilesModule : IRegionModule
-    {
+    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Scene m_scene;
+        private Scene m_scene;
-        public AvatarProfilesModule()
+        public AvatarProfilesModule()
-        {
+        {
-        }
+        }
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
-        {
+        {
-            m_scene = scene;
+            m_scene = scene;
-            m_scene.EventManager.OnNewClient += NewClient;
+            m_scene.EventManager.OnNewClient += NewClient;
-        }
+        }
-        public void PostInitialise()
+        public void PostInitialise()
-        {
+        {
-        }
+        }
-        public void Close()
+        public void Close()
-        {
+        {
-        }
+        }
-        public string Name
+        public string Name
-        {
+        {
-            get { return "AvatarProfilesModule"; }
+            get { return "AvatarProfilesModule"; }
-        }
+        }
-        public bool IsSharedModule
+        public bool IsSharedModule
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        public void NewClient(IClientAPI client)
+        public void NewClient(IClientAPI client)
-        {
+        {
-            client.OnRequestAvatarProperties += RequestAvatarProperty;
+            client.OnRequestAvatarProperties += RequestAvatarProperty;
-            client.OnUpdateAvatarProperties += UpdateAvatarProperties;
+            client.OnUpdateAvatarProperties += UpdateAvatarProperties;
-        }
+        }
-        public void RemoveClient(IClientAPI client)
+        public void RemoveClient(IClientAPI client)
-        {
+        {
-            client.OnRequestAvatarProperties -= RequestAvatarProperty;
+            client.OnRequestAvatarProperties -= RequestAvatarProperty;
-            client.OnUpdateAvatarProperties -= UpdateAvatarProperties;
+            client.OnUpdateAvatarProperties -= UpdateAvatarProperties;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// 
+        /// 
-        /// </summary>
+        /// </summary>
-        /// <param name="remoteClient"></param>
+        /// <param name="remoteClient"></param>
-        /// <param name="avatarID"></param>
+        /// <param name="avatarID"></param>
-        public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
+        public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
-        {
+        {
-            // FIXME: finish adding fields such as url, masking, etc.
+            // FIXME: finish adding fields such as url, masking, etc.
-            LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
+            LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
-            UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
+            UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
-            if (null != profile)
+            if (null != profile)
-            {
+            {
-                remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
+                remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
-                    Util.ToDateTime(profile.Created).ToString(),
+                                                  Util.ToDateTime(profile.Created).ToString(),
-                    String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
+                                                  String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
-                    profile.FirstLifeImage, profile.Image, String.Empty, partner);
+                                                  profile.FirstLifeImage, profile.Image, String.Empty, partner);
-            }
+            }
-            else
+            else
-            {
+            {
-                m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());
+                m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());
-            }
+            }
-        }
+        }
-        public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
+        public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
-        {
+        {
-            UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
+            UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
-           
+           
-            // if it's the profile of the user requesting the update, then we change only a few things.
+            // if it's the profile of the user requesting the update, then we change only a few things.
-            if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
+            if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
-            {
+            {
-                Profile.Image = newProfile.Image;
+                Profile.Image = newProfile.Image;
-                Profile.FirstLifeImage = newProfile.FirstLifeImage;
+                Profile.FirstLifeImage = newProfile.FirstLifeImage;
-                Profile.AboutText = newProfile.AboutText;
+                Profile.AboutText = newProfile.AboutText;
-                Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
+                Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
-            }
+            }
-            else
+            else
-            {
+            {
-                return;
+                return;
-            }
+            }
-            if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
+            if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
-            {
+            {
-                RequestAvatarProperty(remoteClient, newProfile.ID);
+                RequestAvatarProperty(remoteClient, newProfile.ID);
-            }
+            }
-        }
+        }
-    }
+    }
-}
+}
+\ No newline at end of file
author	Adam Frisby	2008-04-30 21:16:36 +0000
committer	Adam Frisby	2008-04-30 21:16:36 +0000
commit	f5c312bc3c2567449c7268a54a08a54119f58d53 (patch)
tree	424668a4bbec6873ebc5b8256f3671db102f5e9c /OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
parent	* Adds the AuthbuyerID field to sqlite and makes use of it. (diff)
download	opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.zip opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.tar.gz opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.tar.bz2 opensim-SC-f5c312bc3c2567449c7268a54a08a54119f58d53.tar.xz

diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index 44b3f8b..f8b14d3 100644 --- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -1,129 +1,129 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	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	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	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	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.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using System;	28	using System;
29	using System.Reflection;	29	using System.Reflection;
30	using libsecondlife;	30	using libsecondlife;
31	using log4net;	31	using log4net;
32	using Nini.Config;	32	using Nini.Config;
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34	using OpenSim.Region.Environment.Interfaces;	34	using OpenSim.Region.Environment.Interfaces;
35	using OpenSim.Region.Environment.Scenes;	35	using OpenSim.Region.Environment.Scenes;
36		36
37	namespace OpenSim.Region.Environment.Modules	37	namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
38	{	38	{
39	public class AvatarProfilesModule : IRegionModule	39	public class AvatarProfilesModule : IRegionModule
40	{	40	{
41	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	41	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42	private Scene m_scene;	42	private Scene m_scene;
43		43
44	public AvatarProfilesModule()	44	public AvatarProfilesModule()
45	{	45	{
46	}	46	}
47		47
48	public void Initialise(Scene scene, IConfigSource config)	48	public void Initialise(Scene scene, IConfigSource config)
49	{	49	{
50	m_scene = scene;	50	m_scene = scene;
51	m_scene.EventManager.OnNewClient += NewClient;	51	m_scene.EventManager.OnNewClient += NewClient;
52	}	52	}
53		53
54	public void PostInitialise()	54	public void PostInitialise()
55	{	55	{
56	}	56	}
57		57
58	public void Close()	58	public void Close()
59	{	59	{
60	}	60	}
61		61
62	public string Name	62	public string Name
63	{	63	{
64	get { return "AvatarProfilesModule"; }	64	get { return "AvatarProfilesModule"; }
65	}	65	}
66		66
67	public bool IsSharedModule	67	public bool IsSharedModule
68	{	68	{
69	get { return false; }	69	get { return false; }
70	}	70	}
71		71
72	public void NewClient(IClientAPI client)	72	public void NewClient(IClientAPI client)
73	{	73	{
74	client.OnRequestAvatarProperties += RequestAvatarProperty;	74	client.OnRequestAvatarProperties += RequestAvatarProperty;
75	client.OnUpdateAvatarProperties += UpdateAvatarProperties;	75	client.OnUpdateAvatarProperties += UpdateAvatarProperties;
76	}	76	}
77		77
78	public void RemoveClient(IClientAPI client)	78	public void RemoveClient(IClientAPI client)
79	{	79	{
80	client.OnRequestAvatarProperties -= RequestAvatarProperty;	80	client.OnRequestAvatarProperties -= RequestAvatarProperty;
81	client.OnUpdateAvatarProperties -= UpdateAvatarProperties;	81	client.OnUpdateAvatarProperties -= UpdateAvatarProperties;
82	}	82	}
83		83
84	/// <summary>	84	/// <summary>
85	///	85	///
86	/// </summary>	86	/// </summary>
87	/// <param name="remoteClient"></param>	87	/// <param name="remoteClient"></param>
88	/// <param name="avatarID"></param>	88	/// <param name="avatarID"></param>
89	public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)	89	public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
90	{	90	{
91	// FIXME: finish adding fields such as url, masking, etc.	91	// FIXME: finish adding fields such as url, masking, etc.
92	LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");	92	LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
93	UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);	93	UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
94	if (null != profile)	94	if (null != profile)
95	{	95	{
96	remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,	96	remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
97	Util.ToDateTime(profile.Created).ToString(),	97	Util.ToDateTime(profile.Created).ToString(),
98	String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,	98	String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
99	profile.FirstLifeImage, profile.Image, String.Empty, partner);	99	profile.FirstLifeImage, profile.Image, String.Empty, partner);
100	}	100	}
101	else	101	else
102	{	102	{
103	m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());	103	m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());
104	}	104	}
105	}	105	}
106		106
107	public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)	107	public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
108	{	108	{
109	UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);	109	UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
110		110
111	// if it's the profile of the user requesting the update, then we change only a few things.	111	// if it's the profile of the user requesting the update, then we change only a few things.
112	if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)	112	if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
113	{	113	{
114	Profile.Image = newProfile.Image;	114	Profile.Image = newProfile.Image;
115	Profile.FirstLifeImage = newProfile.FirstLifeImage;	115	Profile.FirstLifeImage = newProfile.FirstLifeImage;
116	Profile.AboutText = newProfile.AboutText;	116	Profile.AboutText = newProfile.AboutText;
117	Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;	117	Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
118	}	118	}
119	else	119	else
120	{	120	{
121	return;	121	return;
122	}	122	}
123	if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))	123	if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
124	{	124	{
125	RequestAvatarProperty(remoteClient, newProfile.ID);	125	RequestAvatarProperty(remoteClient, newProfile.ID);
126	}	126	}
127	}	127	}
128	}	128	}
129	}	129	} \ No newline at end of file