aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTom2010-08-06 11:44:57 -0700
committerTom2010-08-06 11:44:57 -0700
commitf9f776e4071dd983b8d9f52ecb75bc361a2b62ce (patch)
treec202070adf22e071541732c35c90347839a3af36 /OpenSim/Region/ClientStack
parentImplement CreateNewOutfitAttachments. This addresses mantis #199. (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-f9f776e4071dd983b8d9f52ecb75bc361a2b62ce.zip
opensim-SC_OLD-f9f776e4071dd983b8d9f52ecb75bc361a2b62ce.tar.gz
opensim-SC_OLD-f9f776e4071dd983b8d9f52ecb75bc361a2b62ce.tar.bz2
opensim-SC_OLD-f9f776e4071dd983b8d9f52ecb75bc361a2b62ce.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-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 cd7c11b..d2d1e8f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4328,8 +4328,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4328 4328
4329 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount) 4329 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
4330 { 4330 {
4331
4332
4333 int notifyCount = ownersAndCount.Count; 4331 int notifyCount = ownersAndCount.Count;
4334 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); 4332 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
4335 4333
@@ -4601,6 +4599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4601 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes; 4599 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
4602 update.Scale = data.Shape.Scale; 4600 update.Scale = data.Shape.Scale;
4603 update.Text = Util.StringToBytes256(data.Text); 4601 update.Text = Util.StringToBytes256(data.Text);
4602 update.MediaURL = Util.StringToBytes256(data.MediaUrl);
4604 4603
4605 #region PrimFlags 4604 #region PrimFlags
4606 4605