diff options
author | Jeff Ames | 2008-04-03 18:25:01 +0000 |
---|---|---|
committer | Jeff Ames | 2008-04-03 18:25:01 +0000 |
commit | 4f174fbf57160acc05911e9e3b342e8da9eb3644 (patch) | |
tree | cfbc8ecf3470dc729aec6cfe2ba2db3d7b63774e | |
parent | * Attempted resolution for mantis 854 (diff) | |
download | opensim-SC-4f174fbf57160acc05911e9e3b342e8da9eb3644.zip opensim-SC-4f174fbf57160acc05911e9e3b342e8da9eb3644.tar.gz opensim-SC-4f174fbf57160acc05911e9e3b342e8da9eb3644.tar.bz2 opensim-SC-4f174fbf57160acc05911e9e3b342e8da9eb3644.tar.xz |
Update svn properties.
-rw-r--r-- | OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql | 88 | ||||
-rw-r--r-- | OpenSim/Data/MySQLMapper/MySQLDataReader.cs | 30 | ||||
-rw-r--r--[-rwxr-xr-x] | OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs | 288 | ||||
-rw-r--r--[-rwxr-xr-x] | OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs | 0 |
4 files changed, 203 insertions, 203 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql b/OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql index ccefba2..f396005 100644 --- a/OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql +++ b/OpenSim/Data/MSSQL/Resources/AvatarAppearance.sql | |||
@@ -1,44 +1,44 @@ | |||
1 | -- | 1 | -- |
2 | -- Create schema avatar_appearance | 2 | -- Create schema avatar_appearance |
3 | -- | 3 | -- |
4 | 4 | ||
5 | SET ANSI_NULLS ON | 5 | SET ANSI_NULLS ON |
6 | SET QUOTED_IDENTIFIER ON | 6 | SET QUOTED_IDENTIFIER ON |
7 | SET ANSI_PADDING ON | 7 | SET ANSI_PADDING ON |
8 | 8 | ||
9 | CREATE TABLE [avatarappearance] ( | 9 | CREATE TABLE [avatarappearance] ( |
10 | [UUID] uniqueidentifier NOT NULL, | 10 | [UUID] uniqueidentifier NOT NULL, |
11 | [Serial] int NOT NULL, | 11 | [Serial] int NOT NULL, |
12 | [WearableItem0] uniqueidentifier NOT NULL, | 12 | [WearableItem0] uniqueidentifier NOT NULL, |
13 | [WearableAsset0] uniqueidentifier NOT NULL, | 13 | [WearableAsset0] uniqueidentifier NOT NULL, |
14 | [WearableItem1] uniqueidentifier NOT NULL, | 14 | [WearableItem1] uniqueidentifier NOT NULL, |
15 | [WearableAsset1] uniqueidentifier NOT NULL, | 15 | [WearableAsset1] uniqueidentifier NOT NULL, |
16 | [WearableItem2] uniqueidentifier NOT NULL, | 16 | [WearableItem2] uniqueidentifier NOT NULL, |
17 | [WearableAsset2] uniqueidentifier NOT NULL, | 17 | [WearableAsset2] uniqueidentifier NOT NULL, |
18 | [WearableItem3] uniqueidentifier NOT NULL, | 18 | [WearableItem3] uniqueidentifier NOT NULL, |
19 | [WearableAsset3] uniqueidentifier NOT NULL, | 19 | [WearableAsset3] uniqueidentifier NOT NULL, |
20 | [WearableItem4] uniqueidentifier NOT NULL, | 20 | [WearableItem4] uniqueidentifier NOT NULL, |
21 | [WearableAsset4] uniqueidentifier NOT NULL, | 21 | [WearableAsset4] uniqueidentifier NOT NULL, |
22 | [WearableItem5] uniqueidentifier NOT NULL, | 22 | [WearableItem5] uniqueidentifier NOT NULL, |
23 | [WearableAsset5] uniqueidentifier NOT NULL, | 23 | [WearableAsset5] uniqueidentifier NOT NULL, |
24 | [WearableItem6] uniqueidentifier NOT NULL, | 24 | [WearableItem6] uniqueidentifier NOT NULL, |
25 | [WearableAsset6] uniqueidentifier NOT NULL, | 25 | [WearableAsset6] uniqueidentifier NOT NULL, |
26 | [WearableItem7] uniqueidentifier NOT NULL, | 26 | [WearableItem7] uniqueidentifier NOT NULL, |
27 | [WearableAsset7] uniqueidentifier NOT NULL, | 27 | [WearableAsset7] uniqueidentifier NOT NULL, |
28 | [WearableItem8] uniqueidentifier NOT NULL, | 28 | [WearableItem8] uniqueidentifier NOT NULL, |
29 | [WearableAsset8] uniqueidentifier NOT NULL, | 29 | [WearableAsset8] uniqueidentifier NOT NULL, |
30 | [WearableItem9] uniqueidentifier NOT NULL, | 30 | [WearableItem9] uniqueidentifier NOT NULL, |
31 | [WearableAsset9] uniqueidentifier NOT NULL, | 31 | [WearableAsset9] uniqueidentifier NOT NULL, |
32 | [WearableItem10] uniqueidentifier NOT NULL, | 32 | [WearableItem10] uniqueidentifier NOT NULL, |
33 | [WearableAsset10] uniqueidentifier NOT NULL, | 33 | [WearableAsset10] uniqueidentifier NOT NULL, |
34 | [WearableItem11] uniqueidentifier NOT NULL, | 34 | [WearableItem11] uniqueidentifier NOT NULL, |
35 | [WearableAsset11] uniqueidentifier NOT NULL, | 35 | [WearableAsset11] uniqueidentifier NOT NULL, |
36 | [WearableItem12] uniqueidentifier NOT NULL, | 36 | [WearableItem12] uniqueidentifier NOT NULL, |
37 | [WearableAsset12] uniqueidentifier NOT NULL | 37 | [WearableAsset12] uniqueidentifier NOT NULL |
38 | 38 | ||
39 | PRIMARY KEY CLUSTERED ( | 39 | PRIMARY KEY CLUSTERED ( |
40 | [UUID] | 40 | [UUID] |
41 | ) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] | 41 | ) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] |
42 | ) ON [PRIMARY] | 42 | ) ON [PRIMARY] |
43 | 43 | ||
44 | SET ANSI_PADDING OFF | 44 | SET ANSI_PADDING OFF |
diff --git a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs index 113e991..7f86495 100644 --- a/OpenSim/Data/MySQLMapper/MySQLDataReader.cs +++ b/OpenSim/Data/MySQLMapper/MySQLDataReader.cs | |||
@@ -1,15 +1,15 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Data; | 3 | using System.Data; |
4 | using System.Text; | 4 | using System.Text; |
5 | using OpenSim.Data.Base; | 5 | using OpenSim.Data.Base; |
6 | 6 | ||
7 | namespace OpenSim.Data.MySQLMapper | 7 | namespace OpenSim.Data.MySQLMapper |
8 | { | 8 | { |
9 | public class MySQLDataReader : OpenSimDataReader | 9 | public class MySQLDataReader : OpenSimDataReader |
10 | { | 10 | { |
11 | public MySQLDataReader(IDataReader source) : base(source) | 11 | public MySQLDataReader(IDataReader source) : base(source) |
12 | { | 12 | { |
13 | } | 13 | } |
14 | } | 14 | } |
15 | } | 15 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs index a3d6b71..3518e20 100755..100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs | |||
@@ -1,144 +1,144 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 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 | 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 | 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 | 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. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | 37 | ||
38 | namespace OpenSim.Region.Capabilities | 38 | namespace OpenSim.Region.Capabilities |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// CapsHandlers is a cap handler container but also takes | 41 | /// CapsHandlers is a cap handler container but also takes |
42 | /// care of adding and removing cap handlers to and from the | 42 | /// care of adding and removing cap handlers to and from the |
43 | /// supplied BaseHttpServer. | 43 | /// supplied BaseHttpServer. |
44 | /// </summary> | 44 | /// </summary> |
45 | public class CapsHandlers | 45 | public class CapsHandlers |
46 | { | 46 | { |
47 | private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>(); | 47 | private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>(); |
48 | private BaseHttpServer m_httpListener; | 48 | private BaseHttpServer m_httpListener; |
49 | private string m_httpListenerHostName; | 49 | private string m_httpListenerHostName; |
50 | private uint m_httpListenerPort; | 50 | private uint m_httpListenerPort; |
51 | 51 | ||
52 | /// <summary></summary> | 52 | /// <summary></summary> |
53 | /// <param name="httpListener">base HTTP server</param> | 53 | /// <param name="httpListener">base HTTP server</param> |
54 | /// <param name="httpListenerHostname">host name of the HTTP | 54 | /// <param name="httpListenerHostname">host name of the HTTP |
55 | /// server</param> | 55 | /// server</param> |
56 | /// <param name="httpListenerPort">HTTP port</param> | 56 | /// <param name="httpListenerPort">HTTP port</param> |
57 | public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) | 57 | public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) |
58 | { | 58 | { |
59 | m_httpListener = httpListener; | 59 | m_httpListener = httpListener; |
60 | m_httpListenerHostName = httpListenerHostname; | 60 | m_httpListenerHostName = httpListenerHostname; |
61 | m_httpListenerPort = httpListenerPort; | 61 | m_httpListenerPort = httpListenerPort; |
62 | } | 62 | } |
63 | 63 | ||
64 | /// <summary> | 64 | /// <summary> |
65 | /// Remove the cap handler for a capability. | 65 | /// Remove the cap handler for a capability. |
66 | /// </summary> | 66 | /// </summary> |
67 | /// <param name="capsName">name of the capability of the cap | 67 | /// <param name="capsName">name of the capability of the cap |
68 | /// handler to be removed</param> | 68 | /// handler to be removed</param> |
69 | public void Remove(string capsName) | 69 | public void Remove(string capsName) |
70 | { | 70 | { |
71 | m_capsHandlers.Remove(capsName); | 71 | m_capsHandlers.Remove(capsName); |
72 | } | 72 | } |
73 | 73 | ||
74 | public bool ContainsCap(string cap) | 74 | public bool ContainsCap(string cap) |
75 | { | 75 | { |
76 | return m_capsHandlers.ContainsKey(cap); | 76 | return m_capsHandlers.ContainsKey(cap); |
77 | } | 77 | } |
78 | 78 | ||
79 | /// <summary> | 79 | /// <summary> |
80 | /// The indexer allows us to treat the CapsHandlers object | 80 | /// The indexer allows us to treat the CapsHandlers object |
81 | /// in an intuitive dictionary like way. | 81 | /// in an intuitive dictionary like way. |
82 | /// </summary> | 82 | /// </summary> |
83 | /// <Remarks> | 83 | /// <Remarks> |
84 | /// The indexer will throw an exception when you try to | 84 | /// The indexer will throw an exception when you try to |
85 | /// retrieve a cap handler for a cap that is not contained in | 85 | /// retrieve a cap handler for a cap that is not contained in |
86 | /// CapsHandlers. | 86 | /// CapsHandlers. |
87 | /// </Remarks> | 87 | /// </Remarks> |
88 | public IRequestHandler this[string idx] | 88 | public IRequestHandler this[string idx] |
89 | { | 89 | { |
90 | get | 90 | get |
91 | { | 91 | { |
92 | return m_capsHandlers[idx]; | 92 | return m_capsHandlers[idx]; |
93 | } | 93 | } |
94 | 94 | ||
95 | set | 95 | set |
96 | { | 96 | { |
97 | if (m_capsHandlers.ContainsKey(idx)) | 97 | if (m_capsHandlers.ContainsKey(idx)) |
98 | { | 98 | { |
99 | m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path); | 99 | m_httpListener.RemoveStreamHandler("POST", m_capsHandlers[idx].Path); |
100 | m_capsHandlers.Remove(idx); | 100 | m_capsHandlers.Remove(idx); |
101 | } | 101 | } |
102 | 102 | ||
103 | if (null == value) return; | 103 | if (null == value) return; |
104 | 104 | ||
105 | m_capsHandlers[idx] = value; | 105 | m_capsHandlers[idx] = value; |
106 | m_httpListener.AddStreamHandler(value); | 106 | m_httpListener.AddStreamHandler(value); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | /// <summary> | 110 | /// <summary> |
111 | /// Return the list of cap names for which this CapsHandlers | 111 | /// Return the list of cap names for which this CapsHandlers |
112 | /// object contains cap handlers. | 112 | /// object contains cap handlers. |
113 | /// </summary> | 113 | /// </summary> |
114 | public string[] Caps | 114 | public string[] Caps |
115 | { | 115 | { |
116 | get | 116 | get |
117 | { | 117 | { |
118 | string[] __keys = new string[m_capsHandlers.Keys.Count]; | 118 | string[] __keys = new string[m_capsHandlers.Keys.Count]; |
119 | m_capsHandlers.Keys.CopyTo(__keys, 0); | 119 | m_capsHandlers.Keys.CopyTo(__keys, 0); |
120 | return __keys; | 120 | return __keys; |
121 | } | 121 | } |
122 | } | 122 | } |
123 | 123 | ||
124 | /// <summary> | 124 | /// <summary> |
125 | /// Return an LLSD-serializable Hashtable describing the | 125 | /// Return an LLSD-serializable Hashtable describing the |
126 | /// capabilities and their handler details. | 126 | /// capabilities and their handler details. |
127 | /// </summary> | 127 | /// </summary> |
128 | public Hashtable CapsDetails | 128 | public Hashtable CapsDetails |
129 | { | 129 | { |
130 | get | 130 | get |
131 | { | 131 | { |
132 | Hashtable caps = new Hashtable(); | 132 | Hashtable caps = new Hashtable(); |
133 | string baseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenerPort.ToString(); | 133 | string baseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenerPort.ToString(); |
134 | foreach (string capsName in m_capsHandlers.Keys) | 134 | foreach (string capsName in m_capsHandlers.Keys) |
135 | { | 135 | { |
136 | // skip SEED cap | 136 | // skip SEED cap |
137 | if ("SEED" == capsName) continue; | 137 | if ("SEED" == capsName) continue; |
138 | caps[capsName] = baseUrl + m_capsHandlers[capsName].Path; | 138 | caps[capsName] = baseUrl + m_capsHandlers[capsName].Path; |
139 | } | 139 | } |
140 | return caps; | 140 | return caps; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | } | 143 | } |
144 | } | 144 | } |
diff --git a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs index b2b4f14..b2b4f14 100755..100644 --- a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs | |||