aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-04-05 11:19:38 +0100
committerUbitUmarov2019-04-05 11:19:38 +0100
commit7ce45235e61b1ee48a2b5208e5fdfb39a76ad96c (patch)
tree5ef260984ed2ccfb781104894235241afcef96f6 /OpenSim
parentfix MinRegionViewDistance option (added in last commit); change regions view... (diff)
downloadopensim-SC-7ce45235e61b1ee48a2b5208e5fdfb39a76ad96c.zip
opensim-SC-7ce45235e61b1ee48a2b5208e5fdfb39a76ad96c.tar.gz
opensim-SC-7ce45235e61b1ee48a2b5208e5fdfb39a76ad96c.tar.bz2
opensim-SC-7ce45235e61b1ee48a2b5208e5fdfb39a76ad96c.tar.xz
make sure viewer knows where to place a sitting avatar, this will need deep revision with culling
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 200036c..a52fa76 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4210,8 +4210,17 @@ namespace OpenSim.Region.Framework.Scenes
4210 { 4210 {
4211 m_lastSize = Appearance.AvatarSize; 4211 m_lastSize = Appearance.AvatarSize;
4212 int count = 0; 4212 int count = 0;
4213 SceneObjectPart sitroot = null;
4214 if (ParentID != 0 && ParentPart != null) // we need to send the sitting root prim
4215 {
4216 sitroot = ParentPart.ParentGroup.RootPart;
4217 }
4213 foreach (ScenePresence p in presences) 4218 foreach (ScenePresence p in presences)
4214 { 4219 {
4220 if (sitroot != null) // we need to send the sitting root prim
4221 {
4222 p.ControllingClient.SendEntityFullUpdateImmediate(ParentPart.ParentGroup.RootPart);
4223 }
4215 p.ControllingClient.SendEntityFullUpdateImmediate(this); 4224 p.ControllingClient.SendEntityFullUpdateImmediate(this);
4216 if (p != this && ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && !p.IsViewerUIGod) 4225 if (p != this && ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && !p.IsViewerUIGod)
4217 // either just kill the object 4226 // either just kill the object
@@ -4225,6 +4234,10 @@ namespace OpenSim.Region.Framework.Scenes
4225 4234
4226 public void SendInitialAvatarDataToAgent(ScenePresence p) 4235 public void SendInitialAvatarDataToAgent(ScenePresence p)
4227 { 4236 {
4237 if(ParentID != 0 && ParentPart != null) // we need to send the sitting root prim
4238 {
4239 p.ControllingClient.SendEntityFullUpdateImmediate(ParentPart.ParentGroup.RootPart);
4240 }
4228 p.ControllingClient.SendEntityFullUpdateImmediate(this); 4241 p.ControllingClient.SendEntityFullUpdateImmediate(this);
4229 if (p != this && ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && !p.IsViewerUIGod) 4242 if (p != this && ParcelHideThisAvatar && currentParcelUUID != p.currentParcelUUID && !p.IsViewerUIGod)
4230 // either just kill the object 4243 // either just kill the object