diff options
author | Oren Hurvitz | 2013-10-30 12:46:03 +0200 |
---|---|---|
committer | Oren Hurvitz | 2014-03-24 18:01:28 +0100 |
commit | a2dd8f31dea20d43c942aeee7aae8b208989bbe7 (patch) | |
tree | dc57099c66f50187efe19b548418ad1fb13388ba | |
parent | Fixed: OnRegionInfoChange was never triggered (diff) | |
download | opensim-SC_OLD-a2dd8f31dea20d43c942aeee7aae8b208989bbe7.zip opensim-SC_OLD-a2dd8f31dea20d43c942aeee7aae8b208989bbe7.tar.gz opensim-SC_OLD-a2dd8f31dea20d43c942aeee7aae8b208989bbe7.tar.bz2 opensim-SC_OLD-a2dd8f31dea20d43c942aeee7aae8b208989bbe7.tar.xz |
Trim search queries (for users, groups, etc.). I have found that sometimes the viewer adds a space at the end, which causes searches to fail.
Resolves http://opensimulator.org/mantis/view.php?id=6935
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 05dd764..86161c9 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -10387,7 +10387,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
10387 | handlerDirFindQuery(this, | 10387 | handlerDirFindQuery(this, |
10388 | dirFindQueryPacket.QueryData.QueryID, | 10388 | dirFindQueryPacket.QueryData.QueryID, |
10389 | Utils.BytesToString( | 10389 | Utils.BytesToString( |
10390 | dirFindQueryPacket.QueryData.QueryText), | 10390 | dirFindQueryPacket.QueryData.QueryText).Trim(), |
10391 | dirFindQueryPacket.QueryData.QueryFlags, | 10391 | dirFindQueryPacket.QueryData.QueryFlags, |
10392 | dirFindQueryPacket.QueryData.QueryStart); | 10392 | dirFindQueryPacket.QueryData.QueryStart); |
10393 | } | 10393 | } |
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs index 8838612..3849996 100644 --- a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs | |||
@@ -150,6 +150,8 @@ namespace OpenSim.Region.CoreModules.Framework.Search | |||
150 | 150 | ||
151 | void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart) | 151 | void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart) |
152 | { | 152 | { |
153 | queryText = queryText.Trim(); | ||
154 | |||
153 | if (((DirFindFlags)queryFlags & DirFindFlags.People) == DirFindFlags.People) | 155 | if (((DirFindFlags)queryFlags & DirFindFlags.People) == DirFindFlags.People) |
154 | { | 156 | { |
155 | if (string.IsNullOrEmpty(queryText)) | 157 | if (string.IsNullOrEmpty(queryText)) |
@@ -194,4 +196,4 @@ namespace OpenSim.Region.CoreModules.Framework.Search | |||
194 | 196 | ||
195 | } | 197 | } |
196 | 198 | ||
197 | } \ No newline at end of file | 199 | } |