diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs index 426174d..5163169 100644 --- a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs +++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs | |||
| @@ -74,7 +74,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 74 | 74 | ||
| 75 | int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize)); | 75 | int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize)); |
| 76 | int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber)); | 76 | int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber)); |
| 77 | 77 | ||
| 78 | // Full content request | 78 | // Full content request |
| 79 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK; | 79 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK; |
| 80 | //httpResponse.ContentLength = ??; | 80 | //httpResponse.ContentLength = ??; |