diff options
author | mingchen | 2007-06-27 19:43:46 +0000 |
---|---|---|
committer | mingchen | 2007-06-27 19:43:46 +0000 |
commit | 0232f01a58a3c0a88e95c22589efec21f502f081 (patch) | |
tree | ff210fa6750c23972086ebbf816ead0a0a2f412a /OpenSim/Region/Capabilities/Caps.cs | |
parent | *Moved VersionInfo.cs to its correct place in OpenSim.csproj (diff) | |
download | opensim-SC_OLD-0232f01a58a3c0a88e95c22589efec21f502f081.zip opensim-SC_OLD-0232f01a58a3c0a88e95c22589efec21f502f081.tar.gz opensim-SC_OLD-0232f01a58a3c0a88e95c22589efec21f502f081.tar.bz2 opensim-SC_OLD-0232f01a58a3c0a88e95c22589efec21f502f081.tar.xz |
*Moved all the classes into their own file from LLSDHelpers.cs
*Some folder renaming to follow project Name
*Updated prebuild.xml
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Capabilities/Caps.cs (renamed from OpenSim/Region/Caps/Caps.cs) | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/OpenSim/Region/Caps/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs index 414828a..416a6bc 100644 --- a/OpenSim/Region/Caps/Caps.cs +++ b/OpenSim/Region/Capabilities/Caps.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
1 | using System; | 28 | using System; |
2 | using System.Collections; | 29 | using System.Collections; |
3 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
@@ -11,7 +38,7 @@ using OpenSim.Framework.Types; | |||
11 | using OpenSim.Region.Caches; | 38 | using OpenSim.Region.Caches; |
12 | using libsecondlife; | 39 | using libsecondlife; |
13 | 40 | ||
14 | namespace OpenSim.Region | 41 | namespace OpenSim.Region.Capabilities |
15 | { | 42 | { |
16 | public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data); | 43 | public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data); |
17 | 44 | ||
@@ -126,14 +153,8 @@ namespace OpenSim.Region | |||
126 | 153 | ||
127 | public string ProcessEventQueue(string request, string path, string param) | 154 | public string ProcessEventQueue(string request, string path, string param) |
128 | { | 155 | { |
129 | // Console.WriteLine("event queue request " + request); | ||
130 | string res = ""; | 156 | string res = ""; |
131 | int timer = 0; | 157 | |
132 | |||
133 | /*while ((timer < 200) || (this.CapsEventQueue.Count < 1)) | ||
134 | { | ||
135 | timer++; | ||
136 | }*/ | ||
137 | if (this.CapsEventQueue.Count > 0) | 158 | if (this.CapsEventQueue.Count > 0) |
138 | { | 159 | { |
139 | lock (this.CapsEventQueue) | 160 | lock (this.CapsEventQueue) |