aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
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/Environment/Scenes/Scene.cs
parent* A tweak of the caps system so that new caps have random paths instead of a ... (diff)
downloadopensim-SC-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.zip
opensim-SC-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.tar.gz
opensim-SC-bf7e7b2c57d9b1d7d00f76bbae41093eaf267921.tar.bz2
opensim-SC-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 '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 957c75c..464926d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1578,6 +1578,8 @@ namespace OpenSim.Region.Environment.Scenes
1578 client.OnAvatarPickerRequest += ProcessAvatarPickerRequest; 1578 client.OnAvatarPickerRequest += ProcessAvatarPickerRequest;
1579 client.OnPacketStats += AddPacketStats; 1579 client.OnPacketStats += AddPacketStats;
1580 1580
1581 client.OnObjectIncludeInSearch += m_innerScene.MakeObjectSearchable;
1582
1581 EventManager.TriggerOnNewClient(client); 1583 EventManager.TriggerOnNewClient(client);
1582 } 1584 }
1583 1585