aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-30 00:13:07 +0100
committerJustin Clark-Casey (justincc)2011-03-30 00:13:07 +0100
commit8b16f7d976dc60b06f6d08e9d9d853ae69de5fc9 (patch)
tree9cb7254d3731c28aca723a0c6745909319553c66 /OpenSim/Region/ClientStack/LindenUDP
parentMerge branch 'primcounts' (diff)
downloadopensim-SC_OLD-8b16f7d976dc60b06f6d08e9d9d853ae69de5fc9.zip
opensim-SC_OLD-8b16f7d976dc60b06f6d08e9d9d853ae69de5fc9.tar.gz
opensim-SC_OLD-8b16f7d976dc60b06f6d08e9d9d853ae69de5fc9.tar.bz2
opensim-SC_OLD-8b16f7d976dc60b06f6d08e9d9d853ae69de5fc9.tar.xz
(re)implement selected prim count.
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs46
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 8ebcabb..2faffae 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4343,28 +4343,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4343 } 4343 }
4344 4344
4345 updateMessage.SnapSelection = snap_selection; 4345 updateMessage.SnapSelection = snap_selection;
4346 updateMessage.SnapshotID = landData.SnapshotID; 4346 updateMessage.SnapshotID = landData.SnapshotID;
4347 updateMessage.Status = (ParcelStatus) landData.Status; 4347 updateMessage.Status = (ParcelStatus) landData.Status;
4348 updateMessage.UserLocation = landData.UserLocation; 4348 updateMessage.UserLocation = landData.UserLocation;
4349 updateMessage.UserLookAt = landData.UserLookAt; 4349 updateMessage.UserLookAt = landData.UserLookAt;
4350 4350
4351 updateMessage.MediaType = landData.MediaType; 4351 updateMessage.MediaType = landData.MediaType;
4352 updateMessage.MediaDesc = landData.MediaDescription; 4352 updateMessage.MediaDesc = landData.MediaDescription;
4353 updateMessage.MediaWidth = landData.MediaWidth; 4353 updateMessage.MediaWidth = landData.MediaWidth;
4354 updateMessage.MediaHeight = landData.MediaHeight; 4354 updateMessage.MediaHeight = landData.MediaHeight;
4355 updateMessage.MediaLoop = landData.MediaLoop; 4355 updateMessage.MediaLoop = landData.MediaLoop;
4356 updateMessage.ObscureMusic = landData.ObscureMusic; 4356 updateMessage.ObscureMusic = landData.ObscureMusic;
4357 updateMessage.ObscureMedia = landData.ObscureMedia; 4357 updateMessage.ObscureMedia = landData.ObscureMedia;
4358 4358
4359 IPrimCounts pc = lo.PrimCounts; 4359 IPrimCounts pc = lo.PrimCounts;
4360 updateMessage.OwnerPrims = pc.Owner; 4360 updateMessage.OwnerPrims = pc.Owner;
4361 updateMessage.GroupPrims = pc.Group; 4361 updateMessage.GroupPrims = pc.Group;
4362 updateMessage.OtherPrims = pc.Others; 4362 updateMessage.OtherPrims = pc.Others;
4363 updateMessage.TotalPrims = pc.Total; 4363 updateMessage.SelectedPrims = pc.Selected;
4364 updateMessage.SimWideTotalPrims = pc.Simulator; 4364 updateMessage.TotalPrims = pc.Total;
4365 4365 updateMessage.SimWideTotalPrims = pc.Simulator;
4366 // TODO: Need to transfer selected prims to new prim count structure.
4367 updateMessage.SelectedPrims = landData.SelectedPrims;
4368 4366
4369 try 4367 try
4370 { 4368 {
@@ -4372,13 +4370,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4372 if (eq != null) 4370 if (eq != null)
4373 { 4371 {
4374 eq.ParcelProperties(updateMessage, this.AgentId); 4372 eq.ParcelProperties(updateMessage, this.AgentId);
4375 } else { 4373 }
4376 m_log.Warn("No EQ Interface when sending parcel data."); 4374 else
4375 {
4376 m_log.Warn("[LLCLIENTVIEW]: No EQ Interface when sending parcel data.");
4377 } 4377 }
4378 } 4378 }
4379 catch (Exception ex) 4379 catch (Exception ex)
4380 { 4380 {
4381 m_log.Error("Unable to send parcel data via eventqueue - exception: " + ex.ToString()); 4381 m_log.Error("[LLCLIENTVIEW]: Unable to send parcel data via eventqueue - exception: " + ex.ToString());
4382 } 4382 }
4383 } 4383 }
4384 4384