aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorCharles Krinke2008-04-16 03:55:21 +0000
committerCharles Krinke2008-04-16 03:55:21 +0000
commitbf7e7b2c57d9b1d7d00f76bbae41093eaf267921 (patch)
tree31ab1bc76ee105b67225857850fd59073da0d131 /OpenSim/Region/ClientStack
parent* A tweak of the caps system so that new caps have random paths instead of a ... (diff)
downloadopensim-SC_OLD-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.zip
opensim-SC_OLD-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.tar.gz
opensim-SC_OLD-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.tar.bz2
opensim-SC_OLD-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.tar.xz
Thank you very much, Kmeisthax for:
This patch makes the "Show in Search" checkbox on the viewer work. Additionally, I also discovered that show-in-search objects use the JointWheel flag, so this patch currently uses that flag. LibSL needs to add a flag to enum LLObject.ObjectFlags, "IncludeSearch = 32768" so we aren't using a legacy flag. Additionally this patch also contains a small fix to BaseHTTPServer that lets the response content-type to be something other than text/html. For some reason this didn't get submitted with the DataSnapshot merge.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index f065bae..dba5b38 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -163,6 +163,7 @@ namespace OpenSim.Region.ClientStack
163 private ObjectDuplicateOnRay handlerObjectDuplicateOnRay = null; 163 private ObjectDuplicateOnRay handlerObjectDuplicateOnRay = null;
164 private ObjectSelect handlerObjectSelect = null; 164 private ObjectSelect handlerObjectSelect = null;
165 private ObjectDeselect handlerObjectDeselect = null; 165 private ObjectDeselect handlerObjectDeselect = null;
166 private ObjectIncludeInSearch handlerObjectIncludeInSearch = null;
166 private UpdatePrimFlags handlerUpdatePrimFlags = null; //OnUpdatePrimFlags; 167 private UpdatePrimFlags handlerUpdatePrimFlags = null; //OnUpdatePrimFlags;
167 private UpdatePrimTexture handlerUpdatePrimTexture = null; 168 private UpdatePrimTexture handlerUpdatePrimTexture = null;
168 private UpdateVector handlerGrabObject = null; //OnGrabObject; 169 private UpdateVector handlerGrabObject = null; //OnGrabObject;
@@ -699,6 +700,7 @@ namespace OpenSim.Region.ClientStack
699 public event ObjectDeselect OnObjectDeselect; 700 public event ObjectDeselect OnObjectDeselect;
700 public event GenericCall7 OnObjectDescription; 701 public event GenericCall7 OnObjectDescription;
701 public event GenericCall7 OnObjectName; 702 public event GenericCall7 OnObjectName;
703 public event ObjectIncludeInSearch OnObjectIncludeInSearch;
702 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; 704 public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
703 public event UpdatePrimFlags OnUpdatePrimFlags; 705 public event UpdatePrimFlags OnUpdatePrimFlags;
704 public event UpdatePrimTexture OnUpdatePrimTexture; 706 public event UpdatePrimTexture OnUpdatePrimTexture;
@@ -3791,6 +3793,22 @@ namespace OpenSim.Region.ClientStack
3791 } 3793 }
3792 3794
3793 break; 3795 break;
3796 case PacketType.ObjectIncludeInSearch:
3797 //This lets us set objects to appear in search (stuff like DataSnapshot, etc)
3798 ObjectIncludeInSearchPacket packInSearch = (ObjectIncludeInSearchPacket)Pack;
3799 handlerObjectIncludeInSearch = null;
3800
3801 foreach (ObjectIncludeInSearchPacket.ObjectDataBlock objData in packInSearch.ObjectData) {
3802 bool inSearch = objData.IncludeInSearch;
3803 uint localID = objData.ObjectLocalID;
3804
3805 handlerObjectIncludeInSearch = OnObjectIncludeInSearch;
3806
3807 if (handlerObjectIncludeInSearch != null) {
3808 handlerObjectIncludeInSearch(this, inSearch, localID);
3809 }
3810 }
3811 break;
3794 3812
3795 #endregion 3813 #endregion
3796 3814