diff options
author | UbitUmarov | 2016-12-07 20:34:11 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-07 20:34:11 +0000 |
commit | 55c04a24101792ac5060a2fa12c5cccf1fe392fb (patch) | |
tree | ec53ac0c8b6314c2049df2e7767ee08c581374f6 /OpenSim/Region/CoreModules/Avatar | |
parent | change a few ssl config comments (diff) | |
parent | add missing sp Intransit control (diff) | |
download | opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.zip opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.tar.gz opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.tar.bz2 opensim-SC-55c04a24101792ac5060a2fa12c5cccf1fe392fb.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 61835f9..5be8556 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -320,13 +320,12 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
320 | UUID targetID; | 320 | UUID targetID; |
321 | UUID.TryParse(args[0], out targetID); | 321 | UUID.TryParse(args[0], out targetID); |
322 | 322 | ||
323 | // Can't handle NPC yet... | ||
324 | ScenePresence p = FindPresence(targetID); | ||
325 | 323 | ||
326 | if (null != p) | 324 | ScenePresence p = FindPresence(targetID); |
325 | if (p != null && p.isNPC) | ||
327 | { | 326 | { |
328 | if (p.PresenceType == PresenceType.Npc) | 327 | remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), new Dictionary<UUID, string>()); |
329 | return; | 328 | return; |
330 | } | 329 | } |
331 | 330 | ||
332 | string serverURI = string.Empty; | 331 | string serverURI = string.Empty; |
@@ -575,10 +574,10 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
575 | // Can't handle NPC yet... | 574 | // Can't handle NPC yet... |
576 | ScenePresence p = FindPresence(targetId); | 575 | ScenePresence p = FindPresence(targetId); |
577 | 576 | ||
578 | if (null != p) | 577 | if (p != null && p.isNPC) |
579 | { | 578 | { |
580 | if (p.PresenceType == PresenceType.Npc) | 579 | remoteClient.SendAvatarPicksReply(new UUID(args[0]), new Dictionary<UUID, string>()); |
581 | return; | 580 | return; |
582 | } | 581 | } |
583 | 582 | ||
584 | string serverURI = string.Empty; | 583 | string serverURI = string.Empty; |
@@ -860,6 +859,14 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
860 | /// </param> | 859 | /// </param> |
861 | public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes) | 860 | public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes) |
862 | { | 861 | { |
862 | ScenePresence p = FindPresence(queryTargetID); | ||
863 | if (p != null && p.isNPC) | ||
864 | { | ||
865 | remoteClient.SendAgentAlertMessage( | ||
866 | "Notes for NPCs not available", false); | ||
867 | return; | ||
868 | } | ||
869 | |||
863 | UserProfileNotes note = new UserProfileNotes(); | 870 | UserProfileNotes note = new UserProfileNotes(); |
864 | 871 | ||
865 | note.UserId = remoteClient.AgentId; | 872 | note.UserId = remoteClient.AgentId; |
@@ -1000,10 +1007,14 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1000 | // Can't handle NPC yet... | 1007 | // Can't handle NPC yet... |
1001 | ScenePresence p = FindPresence(avatarID); | 1008 | ScenePresence p = FindPresence(avatarID); |
1002 | 1009 | ||
1003 | if (null != p) | 1010 | if (p != null && p.isNPC) |
1004 | { | 1011 | { |
1005 | if (p.PresenceType == PresenceType.Npc) | 1012 | remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, "5/25/1977", |
1006 | return; | 1013 | Utils.StringToBytes("Non Player Character (NPC)"), "NPCs have no life", 16, |
1014 | UUID.Zero, UUID.Zero, "", UUID.Zero); | ||
1015 | remoteClient.SendAvatarInterestsReply(avatarID, 0, "", | ||
1016 | 0, "Getting into trouble", "Droidspeak"); | ||
1017 | return; | ||
1007 | } | 1018 | } |
1008 | 1019 | ||
1009 | string serverURI = string.Empty; | 1020 | string serverURI = string.Empty; |