aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMandarinka Tasty2016-12-10 21:15:22 +0100
committerUbitUmarov2016-12-10 22:45:11 +0000
commit5b7986e6beb3d452a2845fa367b26c818098aba5 (patch)
treea7801c362d8d0ec5a01fb600f30bfc1ccb05525d
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-5b7986e6beb3d452a2845fa367b26c818098aba5.zip
opensim-SC_OLD-5b7986e6beb3d452a2845fa367b26c818098aba5.tar.gz
opensim-SC_OLD-5b7986e6beb3d452a2845fa367b26c818098aba5.tar.bz2
opensim-SC_OLD-5b7986e6beb3d452a2845fa367b26c818098aba5.tar.xz
Setting precise date of creation in NPC's profile.
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/INPCModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs7
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs2
4 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 5be8556..7d68299 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1009,7 +1009,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1009 1009
1010 if (p != null && p.isNPC) 1010 if (p != null && p.isNPC)
1011 { 1011 {
1012 remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, "5/25/1977", 1012 remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, ((INPC)(p.ControllingClient)).Born,
1013 Utils.StringToBytes("Non Player Character (NPC)"), "NPCs have no life", 16, 1013 Utils.StringToBytes("Non Player Character (NPC)"), "NPCs have no life", 16,
1014 UUID.Zero, UUID.Zero, "", UUID.Zero); 1014 UUID.Zero, UUID.Zero, "", UUID.Zero);
1015 remoteClient.SendAvatarInterestsReply(avatarID, 0, "", 1015 remoteClient.SendAvatarInterestsReply(avatarID, 0, "",
diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index 1310358..dd4226c 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.Framework.Interfaces
59 UUID ActiveGroupId { get; set; } 59 UUID ActiveGroupId { get; set; }
60 UUID Owner { get; } 60 UUID Owner { get; }
61 string profileAbout { get; set; } 61 string profileAbout { get; set; }
62 string Born { get; set; }
62 } 63 }
63 64
64 public interface INPCModule 65 public interface INPCModule
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 1096eae..b904353 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
70 private readonly UUID m_ownerID; 70 private readonly UUID m_ownerID;
71 private UUID m_hostGroupID; 71 private UUID m_hostGroupID;
72 private string m_profileAbout = ""; 72 private string m_profileAbout = "";
73 private string m_born;
73 public List<uint> SelectedObjects {get; private set;} 74 public List<uint> SelectedObjects {get; private set;}
74 75
75 public NPCAvatar( 76 public NPCAvatar(
@@ -611,6 +612,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
611 set { } 612 set { }
612 } 613 }
613 614
615 public string Born
616 {
617 get { return m_born; }
618 set { m_born = value; }
619 }
620
614 public bool IsGroupMember(UUID groupID) 621 public bool IsGroupMember(UUID groupID)
615 { 622 {
616 return (m_hostGroupID == groupID); 623 return (m_hostGroupID == groupID);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 8462661..ced82e6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
168 AvatarAppearance appearance) 168 AvatarAppearance appearance)
169 { 169 {
170 NPCAvatar npcAvatar = null; 170 NPCAvatar npcAvatar = null;
171 string born = DateTime.UtcNow.ToString();
171 172
172 try 173 try
173 { 174 {
@@ -222,6 +223,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
222 ScenePresence sp; 223 ScenePresence sp;
223 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) 224 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
224 { 225 {
226 npcAvatar.Born = born;
225 npcAvatar.ActiveGroupId = groupID; 227 npcAvatar.ActiveGroupId = groupID;
226 sp.CompleteMovement(npcAvatar, false); 228 sp.CompleteMovement(npcAvatar, false);
227 sp.Grouptitle = groupTitle; 229 sp.Grouptitle = groupTitle;