aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-12-14 14:48:50 +0000
committerUbitUmarov2016-12-14 14:48:50 +0000
commit7a31a854083bb9345bbc184e8187fa662e21c5f5 (patch)
treec7583d9e989e03f5c7b21eed5c2ece3356984154 /OpenSim
parentfix: check for region_handle before region_id, viewers are so funny.. (diff)
downloadopensim-SC-7a31a854083bb9345bbc184e8187fa662e21c5f5.zip
opensim-SC-7a31a854083bb9345bbc184e8187fa662e21c5f5.tar.gz
opensim-SC-7a31a854083bb9345bbc184e8187fa662e21c5f5.tar.bz2
opensim-SC-7a31a854083bb9345bbc184e8187fa662e21c5f5.tar.xz
show online on profile, if target is in same region.( possible should be done elsewhere)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 5314927..c505d94 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -1010,7 +1010,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1010 if (p != null && p.isNPC) 1010 if (p != null && p.isNPC)
1011 { 1011 {
1012 remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, ((INPC)(p.ControllingClient)).Born, 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", 0x10,
1014 UUID.Zero, ((INPC)(p.ControllingClient)).profileImage, "", UUID.Zero); 1014 UUID.Zero, ((INPC)(p.ControllingClient)).profileImage, "", UUID.Zero);
1015 remoteClient.SendAvatarInterestsReply(avatarID, 0, "", 1015 remoteClient.SendAvatarInterestsReply(avatarID, 0, "",
1016 0, "Getting into trouble", "Droidspeak"); 1016 0, "Getting into trouble", "Droidspeak");
@@ -1085,6 +1085,10 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
1085 return; 1085 return;
1086 } 1086 }
1087 1087
1088 // if on same region force online
1089 if(p != null && !p.IsDeleted)
1090 flags |= 0x10;
1091
1088 remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, membershipType , props.FirstLifeText, flags, 1092 remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, membershipType , props.FirstLifeText, flags,
1089 props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId); 1093 props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId);
1090 1094