aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorMelanie2010-08-06 18:08:40 +0100
committerMelanie2010-08-06 18:08:40 +0100
commit26387252f5adbf71dc77084ff2d1b463fad5038c (patch)
tree0453fd501165368affa2917180ef3e43c5555ea0 /OpenSim/Region/ClientStack/LindenUDP
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentFix a parenthesis in prior commit (diff)
downloadopensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.zip
opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.gz
opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.bz2
opensim-SC-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0b8b95b..ac4be4d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4327,8 +4327,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4327 4327
4328 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount) 4328 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
4329 { 4329 {
4330
4331
4332 int notifyCount = ownersAndCount.Count; 4330 int notifyCount = ownersAndCount.Count;
4333 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); 4331 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
4334 4332
@@ -4600,6 +4598,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4600 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes; 4598 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
4601 update.Scale = data.Shape.Scale; 4599 update.Scale = data.Shape.Scale;
4602 update.Text = Util.StringToBytes256(data.Text); 4600 update.Text = Util.StringToBytes256(data.Text);
4601 update.MediaURL = Util.StringToBytes256(data.MediaUrl);
4603 4602
4604 #region PrimFlags 4603 #region PrimFlags
4605 4604