aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-01 19:33:41 +0100
committerJustin Clark-Casey (justincc)2010-07-26 23:34:18 +0100
commitb1eb83ed6cd5e25c22a858eefd1fba1e6bf622b7 (patch)
treebd045dd3c2b7f76c675599b3b9205b582dce5400 /OpenSim
parentstart storing a mediaurl on the scene object part (diff)
downloadopensim-SC-b1eb83ed6cd5e25c22a858eefd1fba1e6bf622b7.zip
opensim-SC-b1eb83ed6cd5e25c22a858eefd1fba1e6bf622b7.tar.gz
opensim-SC-b1eb83ed6cd5e25c22a858eefd1fba1e6bf622b7.tar.bz2
opensim-SC-b1eb83ed6cd5e25c22a858eefd1fba1e6bf622b7.tar.xz
start sending media url in object full updates
Diffstat (limited to 'OpenSim')
-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 0aec01a..c59eedf 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4288,8 +4288,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4288 4288
4289 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount) 4289 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
4290 { 4290 {
4291
4292
4293 int notifyCount = ownersAndCount.Count; 4291 int notifyCount = ownersAndCount.Count;
4294 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); 4292 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
4295 4293
@@ -4561,6 +4559,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4561 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes; 4559 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
4562 update.Scale = data.Shape.Scale; 4560 update.Scale = data.Shape.Scale;
4563 update.Text = Util.StringToBytes256(data.Text); 4561 update.Text = Util.StringToBytes256(data.Text);
4562 update.MediaURL = Util.StringToBytes256(data.MediaUrl);
4564 4563
4565 #region PrimFlags 4564 #region PrimFlags
4566 4565