diff options
| author | Justin Clark-Casey (justincc) | 2010-08-06 18:28:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-06 18:29:30 +0100 |
| commit | 1270727c969db07831866947b611d49873031739 (patch) | |
| tree | 8fd490eaf5c49d69be948fd9e58c0be1f7e38331 /OpenSim/Region/ClientStack | |
| parent | Change XEngine to use the new constant (diff) | |
| parent | fix mysql/mssql prim serialization problem (diff) | |
| download | opensim-SC_OLD-1270727c969db07831866947b611d49873031739.zip opensim-SC_OLD-1270727c969db07831866947b611d49873031739.tar.gz opensim-SC_OLD-1270727c969db07831866947b611d49873031739.tar.bz2 opensim-SC_OLD-1270727c969db07831866947b611d49873031739.tar.xz | |
Merge branch 'moap'
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 3 |
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 | ||