From d51ce47b2d7635b17f3dd429158e8f59b78b83aa Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 May 2008 14:31:30 +0000
Subject: Update svn properties. Minor formatting cleanup.
---
.../Avatar/Profiles/AvatarProfilesModule.cs | 264 ++++++++++-----------
1 file changed, 132 insertions(+), 132 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs')
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index 1955d2a..15825b6 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -1,133 +1,133 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSim Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * 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
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Reflection;
-using libsecondlife;
-using log4net;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
-
-namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
-{
- public class AvatarProfilesModule : IRegionModule
- {
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private Scene m_scene;
-
- public AvatarProfilesModule()
- {
- }
-
- #region IRegionModule Members
-
- public void Initialise(Scene scene, IConfigSource config)
- {
- m_scene = scene;
- m_scene.EventManager.OnNewClient += NewClient;
- }
-
- public void PostInitialise()
- {
- }
-
- public void Close()
- {
- }
-
- public string Name
- {
- get { return "AvatarProfilesModule"; }
- }
-
- public bool IsSharedModule
- {
- get { return false; }
- }
-
- #endregion
-
- public void NewClient(IClientAPI client)
- {
- client.OnRequestAvatarProperties += RequestAvatarProperty;
- client.OnUpdateAvatarProperties += UpdateAvatarProperties;
- }
-
- public void RemoveClient(IClientAPI client)
- {
- client.OnRequestAvatarProperties -= RequestAvatarProperty;
- client.OnUpdateAvatarProperties -= UpdateAvatarProperties;
- }
-
- ///
- ///
- ///
- ///
- ///
- public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
- {
- // FIXME: finish adding fields such as url, masking, etc.
- LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
- UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
- if (null != profile)
- {
- remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
- Util.ToDateTime(profile.Created).ToString(),
- String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
- profile.FirstLifeImage, profile.Image, String.Empty, partner);
- }
- else
- {
- m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());
- }
- }
-
- public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
- {
- 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 (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
- {
- Profile.Image = newProfile.Image;
- Profile.FirstLifeImage = newProfile.FirstLifeImage;
- Profile.AboutText = newProfile.AboutText;
- Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
- }
- else
- {
- return;
- }
- if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
- {
- RequestAvatarProperty(remoteClient, newProfile.ID);
- }
- }
- }
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSim Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using libsecondlife;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
+{
+ public class AvatarProfilesModule : IRegionModule
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private Scene m_scene;
+
+ public AvatarProfilesModule()
+ {
+ }
+
+ #region IRegionModule Members
+
+ public void Initialise(Scene scene, IConfigSource config)
+ {
+ m_scene = scene;
+ m_scene.EventManager.OnNewClient += NewClient;
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close()
+ {
+ }
+
+ public string Name
+ {
+ get { return "AvatarProfilesModule"; }
+ }
+
+ public bool IsSharedModule
+ {
+ get { return false; }
+ }
+
+ #endregion
+
+ public void NewClient(IClientAPI client)
+ {
+ client.OnRequestAvatarProperties += RequestAvatarProperty;
+ client.OnUpdateAvatarProperties += UpdateAvatarProperties;
+ }
+
+ public void RemoveClient(IClientAPI client)
+ {
+ client.OnRequestAvatarProperties -= RequestAvatarProperty;
+ client.OnUpdateAvatarProperties -= UpdateAvatarProperties;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void RequestAvatarProperty(IClientAPI remoteClient, LLUUID avatarID)
+ {
+ // FIXME: finish adding fields such as url, masking, etc.
+ LLUUID partner = new LLUUID("11111111-1111-0000-0000-000100bba000");
+ UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
+ if (null != profile)
+ {
+ remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
+ Util.ToDateTime(profile.Created).ToString(),
+ String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
+ profile.FirstLifeImage, profile.Image, String.Empty, partner);
+ }
+ else
+ {
+ m_log.Debug("[AvatarProfilesModule]: Got null for profile for " + avatarID.ToString());
+ }
+ }
+
+ public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
+ {
+ 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 (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
+ {
+ Profile.Image = newProfile.Image;
+ Profile.FirstLifeImage = newProfile.FirstLifeImage;
+ Profile.AboutText = newProfile.AboutText;
+ Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
+ }
+ else
+ {
+ return;
+ }
+ if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
+ {
+ RequestAvatarProperty(remoteClient, newProfile.ID);
+ }
+ }
+ }
}
\ No newline at end of file
--
cgit v1.1