diff options
as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.
Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/AuthenticateResponse.cs (renamed from OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs) | 86 | ||||
-rw-r--r-- | OpenSim/Framework/General/IAssetProvider.cs (renamed from OpenSim/Framework/General/Interfaces/IAssetProvider.cs) | 90 | ||||
-rw-r--r-- | OpenSim/Framework/General/IAssetServer.cs (renamed from OpenSim/Framework/General/Interfaces/IAssetServer.cs) | 142 | ||||
-rw-r--r-- | OpenSim/Framework/General/IClientAPI.cs (renamed from OpenSim/Framework/General/Interfaces/IClientAPI.cs) | 780 | ||||
-rw-r--r-- | OpenSim/Framework/General/IPlugin.cs (renamed from OpenSim/Framework/General/Interfaces/IPlugin.cs) | 114 | ||||
-rw-r--r-- | OpenSim/Framework/General/IScene.cs (renamed from OpenSim/Framework/General/Interfaces/IScene.cs) | 94 | ||||
-rw-r--r-- | OpenSim/Framework/General/IUserData.cs (renamed from OpenSim/Framework/General/Interfaces/IUserData.cs) | 270 | ||||
-rw-r--r-- | OpenSim/Framework/General/IUserService.cs (renamed from OpenSim/Framework/General/Interfaces/IUserService.cs) | 96 |
8 files changed, 836 insertions, 836 deletions
diff --git a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs b/OpenSim/Framework/General/AuthenticateResponse.cs index d4e9b42..25bb0dd 100644 --- a/OpenSim/Framework/General/Interfaces/AuthenticateResponse.cs +++ b/OpenSim/Framework/General/AuthenticateResponse.cs | |||
@@ -1,43 +1,43 @@ | |||
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 OpenSim.Framework.Types; | 28 | using OpenSim.Framework; |
29 | 29 | ||
30 | namespace OpenSim.Framework.Interfaces | 30 | namespace OpenSim.Framework |
31 | { | 31 | { |
32 | public class AuthenticateResponse | 32 | public class AuthenticateResponse |
33 | { | 33 | { |
34 | public bool Authorised; | 34 | public bool Authorised; |
35 | public Login LoginInfo; | 35 | public Login LoginInfo; |
36 | 36 | ||
37 | public AuthenticateResponse() | 37 | public AuthenticateResponse() |
38 | { | 38 | { |
39 | 39 | ||
40 | } | 40 | } |
41 | 41 | ||
42 | } | 42 | } |
43 | } | 43 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IAssetProvider.cs b/OpenSim/Framework/General/IAssetProvider.cs index 8fcf762..42dbf1f 100644 --- a/OpenSim/Framework/General/Interfaces/IAssetProvider.cs +++ b/OpenSim/Framework/General/IAssetProvider.cs | |||
@@ -1,45 +1,45 @@ | |||
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 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using OpenSim.Framework.Types; | 32 | using OpenSim.Framework; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | 34 | ||
35 | namespace OpenSim.Framework.Interfaces | 35 | namespace OpenSim.Framework |
36 | { | 36 | { |
37 | public interface IAssetProvider : IPlugin | 37 | public interface IAssetProvider : IPlugin |
38 | { | 38 | { |
39 | AssetBase FetchAsset(LLUUID uuid); | 39 | AssetBase FetchAsset(LLUUID uuid); |
40 | void CreateAsset(AssetBase asset); | 40 | void CreateAsset(AssetBase asset); |
41 | void UpdateAsset(AssetBase asset); | 41 | void UpdateAsset(AssetBase asset); |
42 | bool ExistsAsset(LLUUID uuid); | 42 | bool ExistsAsset(LLUUID uuid); |
43 | void CommitAssets(); // force a sync to the database | 43 | void CommitAssets(); // force a sync to the database |
44 | } | 44 | } |
45 | } | 45 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IAssetServer.cs b/OpenSim/Framework/General/IAssetServer.cs index 8df021e..ae86c8c 100644 --- a/OpenSim/Framework/General/Interfaces/IAssetServer.cs +++ b/OpenSim/Framework/General/IAssetServer.cs | |||
@@ -1,71 +1,71 @@ | |||
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.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using libsecondlife; |
31 | using OpenSim.Framework.Types; | 31 | using OpenSim.Framework; |
32 | 32 | ||
33 | namespace OpenSim.Framework.Interfaces | 33 | namespace OpenSim.Framework |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// Description of IAssetServer. | 36 | /// Description of IAssetServer. |
37 | /// </summary> | 37 | /// </summary> |
38 | 38 | ||
39 | public interface IAssetServer | 39 | public interface IAssetServer |
40 | { | 40 | { |
41 | void SetReceiver(IAssetReceiver receiver); | 41 | void SetReceiver(IAssetReceiver receiver); |
42 | void FetchAsset(LLUUID assetID, bool isTexture); | 42 | void FetchAsset(LLUUID assetID, bool isTexture); |
43 | void UpdateAsset(AssetBase asset); | 43 | void UpdateAsset(AssetBase asset); |
44 | void StoreAndCommitAsset(AssetBase asset); | 44 | void StoreAndCommitAsset(AssetBase asset); |
45 | void Close(); | 45 | void Close(); |
46 | void LoadAsset(AssetBase info, bool image, string filename); | 46 | void LoadAsset(AssetBase info, bool image, string filename); |
47 | List<AssetBase> GetDefaultAssets(); | 47 | List<AssetBase> GetDefaultAssets(); |
48 | AssetBase CreateImageAsset(string assetIdStr, string name, string filename); | 48 | AssetBase CreateImageAsset(string assetIdStr, string name, string filename); |
49 | void ForEachDefaultAsset(Action<AssetBase> action); | 49 | void ForEachDefaultAsset(Action<AssetBase> action); |
50 | AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage); | 50 | AssetBase CreateAsset(string assetIdStr, string name, string filename, bool isImage); |
51 | void ForEachXmlAsset(Action<AssetBase> action); | 51 | void ForEachXmlAsset(Action<AssetBase> action); |
52 | } | 52 | } |
53 | 53 | ||
54 | // could change to delegate? | 54 | // could change to delegate? |
55 | public interface IAssetReceiver | 55 | public interface IAssetReceiver |
56 | { | 56 | { |
57 | void AssetReceived(AssetBase asset, bool IsTexture); | 57 | void AssetReceived(AssetBase asset, bool IsTexture); |
58 | void AssetNotFound(LLUUID assetID); | 58 | void AssetNotFound(LLUUID assetID); |
59 | } | 59 | } |
60 | 60 | ||
61 | public interface IAssetPlugin | 61 | public interface IAssetPlugin |
62 | { | 62 | { |
63 | IAssetServer GetAssetServer(); | 63 | IAssetServer GetAssetServer(); |
64 | } | 64 | } |
65 | 65 | ||
66 | public struct ARequest | 66 | public struct ARequest |
67 | { | 67 | { |
68 | public LLUUID AssetID; | 68 | public LLUUID AssetID; |
69 | public bool IsTexture; | 69 | public bool IsTexture; |
70 | } | 70 | } |
71 | } | 71 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/IClientAPI.cs index 8aae3c2..8c81eae 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/IClientAPI.cs | |||
@@ -1,390 +1,390 @@ | |||
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.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | using OpenSim.Framework.Types; | 33 | using OpenSim.Framework; |
34 | 34 | ||
35 | namespace OpenSim.Framework.Interfaces | 35 | namespace OpenSim.Framework |
36 | { | 36 | { |
37 | // Base Args Interface | 37 | // Base Args Interface |
38 | public interface IEventArgs | 38 | public interface IEventArgs |
39 | { | 39 | { |
40 | IScene Scene | 40 | IScene Scene |
41 | { | 41 | { |
42 | get; | 42 | get; |
43 | set; | 43 | set; |
44 | } | 44 | } |
45 | 45 | ||
46 | IClientAPI Sender | 46 | IClientAPI Sender |
47 | { | 47 | { |
48 | get; | 48 | get; |
49 | set; | 49 | set; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | public delegate void ViewerEffectEventHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock); | 53 | public delegate void ViewerEffectEventHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock); |
54 | 54 | ||
55 | public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); | 55 | public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); |
56 | 56 | ||
57 | public enum ChatTypeEnum { Whisper = 0, Say = 1, Shout = 2, Broadcast = 0xFF }; | 57 | public enum ChatTypeEnum { Whisper = 0, Say = 1, Shout = 2, Broadcast = 0xFF }; |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// ChatFromViewer Arguments | 60 | /// ChatFromViewer Arguments |
61 | /// </summary> | 61 | /// </summary> |
62 | public class ChatFromViewerArgs : EventArgs, IEventArgs | 62 | public class ChatFromViewerArgs : EventArgs, IEventArgs |
63 | { | 63 | { |
64 | protected string m_message; | 64 | protected string m_message; |
65 | protected ChatTypeEnum m_type; | 65 | protected ChatTypeEnum m_type; |
66 | protected int m_channel; | 66 | protected int m_channel; |
67 | protected LLVector3 m_position; | 67 | protected LLVector3 m_position; |
68 | protected string m_from; | 68 | protected string m_from; |
69 | 69 | ||
70 | protected IClientAPI m_sender; | 70 | protected IClientAPI m_sender; |
71 | protected IScene m_scene; | 71 | protected IScene m_scene; |
72 | 72 | ||
73 | /// <summary> | 73 | /// <summary> |
74 | /// The message sent by the user | 74 | /// The message sent by the user |
75 | /// </summary> | 75 | /// </summary> |
76 | public string Message | 76 | public string Message |
77 | { | 77 | { |
78 | get { return m_message; } | 78 | get { return m_message; } |
79 | set { m_message = value; } | 79 | set { m_message = value; } |
80 | } | 80 | } |
81 | 81 | ||
82 | /// <summary> | 82 | /// <summary> |
83 | /// The type of message, eg say, shout, broadcast. | 83 | /// The type of message, eg say, shout, broadcast. |
84 | /// </summary> | 84 | /// </summary> |
85 | public ChatTypeEnum Type | 85 | public ChatTypeEnum Type |
86 | { | 86 | { |
87 | get { return m_type; } | 87 | get { return m_type; } |
88 | set { m_type = value; } | 88 | set { m_type = value; } |
89 | } | 89 | } |
90 | 90 | ||
91 | /// <summary> | 91 | /// <summary> |
92 | /// Which channel was this message sent on? Different channels may have different listeners. Public chat is on channel zero. | 92 | /// Which channel was this message sent on? Different channels may have different listeners. Public chat is on channel zero. |
93 | /// </summary> | 93 | /// </summary> |
94 | public int Channel | 94 | public int Channel |
95 | { | 95 | { |
96 | get { return m_channel; } | 96 | get { return m_channel; } |
97 | set { m_channel = value; } | 97 | set { m_channel = value; } |
98 | } | 98 | } |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
101 | /// The position of the sender at the time of the message broadcast. | 101 | /// The position of the sender at the time of the message broadcast. |
102 | /// </summary> | 102 | /// </summary> |
103 | public LLVector3 Position | 103 | public LLVector3 Position |
104 | { | 104 | { |
105 | get { return m_position; } | 105 | get { return m_position; } |
106 | set { m_position = value; } | 106 | set { m_position = value; } |
107 | } | 107 | } |
108 | 108 | ||
109 | /// <summary> | 109 | /// <summary> |
110 | /// The name of the sender (needed for scripts) | 110 | /// The name of the sender (needed for scripts) |
111 | /// </summary> | 111 | /// </summary> |
112 | public string From | 112 | public string From |
113 | { | 113 | { |
114 | get { return m_from; } | 114 | get { return m_from; } |
115 | set { m_from = value; } | 115 | set { m_from = value; } |
116 | } | 116 | } |
117 | 117 | ||
118 | /// <summary> | 118 | /// <summary> |
119 | /// The client responsible for sending the message, or null. | 119 | /// The client responsible for sending the message, or null. |
120 | /// </summary> | 120 | /// </summary> |
121 | public IClientAPI Sender | 121 | public IClientAPI Sender |
122 | { | 122 | { |
123 | get { return m_sender; } | 123 | get { return m_sender; } |
124 | set { m_sender = value; } | 124 | set { m_sender = value; } |
125 | } | 125 | } |
126 | 126 | ||
127 | public IScene Scene | 127 | public IScene Scene |
128 | { | 128 | { |
129 | get { return m_scene; } | 129 | get { return m_scene; } |
130 | set { m_scene = value; } | 130 | set { m_scene = value; } |
131 | } | 131 | } |
132 | 132 | ||
133 | public ChatFromViewerArgs() | 133 | public ChatFromViewerArgs() |
134 | { | 134 | { |
135 | m_position = new LLVector3(); | 135 | m_position = new LLVector3(); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
139 | public class TextureRequestArgs : EventArgs | 139 | public class TextureRequestArgs : EventArgs |
140 | { | 140 | { |
141 | protected LLUUID m_requestedAssetID; | 141 | protected LLUUID m_requestedAssetID; |
142 | private sbyte m_discardLevel; | 142 | private sbyte m_discardLevel; |
143 | private uint m_packetNumber; | 143 | private uint m_packetNumber; |
144 | 144 | ||
145 | public uint PacketNumber | 145 | public uint PacketNumber |
146 | { | 146 | { |
147 | get { return m_packetNumber; } | 147 | get { return m_packetNumber; } |
148 | set { m_packetNumber = value; } | 148 | set { m_packetNumber = value; } |
149 | } | 149 | } |
150 | 150 | ||
151 | public sbyte DiscardLevel | 151 | public sbyte DiscardLevel |
152 | { | 152 | { |
153 | get { return m_discardLevel; } | 153 | get { return m_discardLevel; } |
154 | set { m_discardLevel = value; } | 154 | set { m_discardLevel = value; } |
155 | } | 155 | } |
156 | 156 | ||
157 | public LLUUID RequestedAssetID | 157 | public LLUUID RequestedAssetID |
158 | { | 158 | { |
159 | get { return m_requestedAssetID; } | 159 | get { return m_requestedAssetID; } |
160 | set { m_requestedAssetID = value; } | 160 | set { m_requestedAssetID = value; } |
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
164 | public delegate void TextureRequest(Object sender, TextureRequestArgs e); | 164 | public delegate void TextureRequest(Object sender, TextureRequestArgs e); |
165 | 165 | ||
166 | public delegate void ImprovedInstantMessage(LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, string fromAgentName, string message, byte dialog); // Cut down from full list | 166 | public delegate void ImprovedInstantMessage(LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, string fromAgentName, string message, byte dialog); // Cut down from full list |
167 | public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos); | 167 | public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos); |
168 | public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, IClientAPI remoteClient); | 168 | public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, IClientAPI remoteClient); |
169 | public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); | 169 | public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); |
170 | public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID, int seq); | 170 | public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID, int seq); |
171 | public delegate void LinkObjects(uint parent, List<uint> children); | 171 | public delegate void LinkObjects(uint parent, List<uint> children); |
172 | public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); | 172 | public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); |
173 | public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); | 173 | public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); |
174 | public delegate void DisconnectUser(); | 174 | public delegate void DisconnectUser(); |
175 | public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID); | 175 | public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID); |
176 | 176 | ||
177 | public delegate void GenericCall(IClientAPI remoteClient); | 177 | public delegate void GenericCall(IClientAPI remoteClient); |
178 | public delegate void GenericCall2(); | 178 | public delegate void GenericCall2(); |
179 | public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. | 179 | public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. |
180 | public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); | 180 | public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); |
181 | public delegate void GenericCall5(IClientAPI remoteClient, bool status); | 181 | public delegate void GenericCall5(IClientAPI remoteClient, bool status); |
182 | public delegate void GenericCall6(LLUUID uid); | 182 | public delegate void GenericCall6(LLUUID uid); |
183 | public delegate void GenericCall7(uint localID, string message); | 183 | public delegate void GenericCall7(uint localID, string message); |
184 | 184 | ||
185 | public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); | 185 | public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); |
186 | public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data); | 186 | public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data); |
187 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); | 187 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); |
188 | public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); | 188 | public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); |
189 | public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); | 189 | public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); |
190 | public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); | 190 | public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); |
191 | public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); | 191 | public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); |
192 | public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); | 192 | public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); |
193 | public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); | 193 | public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); |
194 | public delegate void UpdatePrimGroupRotation(uint localID,LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient); | 194 | public delegate void UpdatePrimGroupRotation(uint localID,LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient); |
195 | public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags); | 195 | public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags); |
196 | public delegate void StatusChange(bool status); | 196 | public delegate void StatusChange(bool status); |
197 | public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); | 197 | public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); |
198 | public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); | 198 | public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); |
199 | public delegate void AgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID); | 199 | public delegate void AgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID); |
200 | public delegate void AgentSit(IClientAPI remoteClient, LLUUID agentID); | 200 | public delegate void AgentSit(IClientAPI remoteClient, LLUUID agentID); |
201 | public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient); | 201 | public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient); |
202 | 202 | ||
203 | public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); | 203 | public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); |
204 | public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client); | 204 | public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client); |
205 | public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client); | 205 | public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client); |
206 | public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); | 206 | public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); |
207 | public delegate void ParcelSelectObjects(int land_local_id, int request_type, IClientAPI remote_client); | 207 | public delegate void ParcelSelectObjects(int land_local_id, int request_type, IClientAPI remote_client); |
208 | public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client); | 208 | public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client); |
209 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); | 209 | public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); |
210 | 210 | ||
211 | public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); | 211 | public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); |
212 | 212 | ||
213 | public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); | 213 | public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); |
214 | 214 | ||
215 | public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID); | 215 | public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID); |
216 | public delegate void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask); | 216 | public delegate void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask); |
217 | public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); | 217 | public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); |
218 | public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID); | 218 | public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID); |
219 | public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID); | 219 | public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID); |
220 | public delegate void UpdateInventoryItemTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID); | 220 | public delegate void UpdateInventoryItemTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID); |
221 | public delegate void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID); | 221 | public delegate void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID); |
222 | public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID); | 222 | public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID); |
223 | public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID); | 223 | public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID); |
224 | 224 | ||
225 | public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal); | 225 | public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal); |
226 | public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data); | 226 | public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data); |
227 | public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName); | 227 | public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName); |
228 | public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); | 228 | public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); |
229 | 229 | ||
230 | public interface IClientAPI | 230 | public interface IClientAPI |
231 | { | 231 | { |
232 | event ImprovedInstantMessage OnInstantMessage; | 232 | event ImprovedInstantMessage OnInstantMessage; |
233 | event ChatFromViewer OnChatFromViewer; | 233 | event ChatFromViewer OnChatFromViewer; |
234 | event TextureRequest OnRequestTexture; | 234 | event TextureRequest OnRequestTexture; |
235 | event RezObject OnRezObject; | 235 | event RezObject OnRezObject; |
236 | event ModifyTerrain OnModifyTerrain; | 236 | event ModifyTerrain OnModifyTerrain; |
237 | event SetAppearance OnSetAppearance; | 237 | event SetAppearance OnSetAppearance; |
238 | event StartAnim OnStartAnim; | 238 | event StartAnim OnStartAnim; |
239 | event LinkObjects OnLinkObjects; | 239 | event LinkObjects OnLinkObjects; |
240 | event RequestMapBlocks OnRequestMapBlocks; | 240 | event RequestMapBlocks OnRequestMapBlocks; |
241 | event TeleportLocationRequest OnTeleportLocationRequest; | 241 | event TeleportLocationRequest OnTeleportLocationRequest; |
242 | event DisconnectUser OnDisconnectUser; | 242 | event DisconnectUser OnDisconnectUser; |
243 | event RequestAvatarProperties OnRequestAvatarProperties; | 243 | event RequestAvatarProperties OnRequestAvatarProperties; |
244 | 244 | ||
245 | event GenericCall4 OnDeRezObject; | 245 | event GenericCall4 OnDeRezObject; |
246 | event GenericCall OnRegionHandShakeReply; | 246 | event GenericCall OnRegionHandShakeReply; |
247 | event GenericCall OnRequestWearables; | 247 | event GenericCall OnRequestWearables; |
248 | event GenericCall2 OnCompleteMovementToRegion; | 248 | event GenericCall2 OnCompleteMovementToRegion; |
249 | event UpdateAgent OnAgentUpdate; | 249 | event UpdateAgent OnAgentUpdate; |
250 | event AgentRequestSit OnAgentRequestSit; | 250 | event AgentRequestSit OnAgentRequestSit; |
251 | event AgentSit OnAgentSit; | 251 | event AgentSit OnAgentSit; |
252 | event GenericCall OnRequestAvatarsData; | 252 | event GenericCall OnRequestAvatarsData; |
253 | event AddNewPrim OnAddPrim; | 253 | event AddNewPrim OnAddPrim; |
254 | event ObjectDuplicate OnObjectDuplicate; | 254 | event ObjectDuplicate OnObjectDuplicate; |
255 | event UpdateVector OnGrabObject; | 255 | event UpdateVector OnGrabObject; |
256 | event ObjectSelect OnDeGrabObject; | 256 | event ObjectSelect OnDeGrabObject; |
257 | event MoveObject OnGrabUpdate; | 257 | event MoveObject OnGrabUpdate; |
258 | 258 | ||
259 | event UpdateShape OnUpdatePrimShape; | 259 | event UpdateShape OnUpdatePrimShape; |
260 | event ObjectExtraParams OnUpdateExtraParams; | 260 | event ObjectExtraParams OnUpdateExtraParams; |
261 | event ObjectSelect OnObjectSelect; | 261 | event ObjectSelect OnObjectSelect; |
262 | event ObjectDeselect OnObjectDeselect; | 262 | event ObjectDeselect OnObjectDeselect; |
263 | event GenericCall7 OnObjectDescription; | 263 | event GenericCall7 OnObjectDescription; |
264 | event GenericCall7 OnObjectName; | 264 | event GenericCall7 OnObjectName; |
265 | event UpdatePrimFlags OnUpdatePrimFlags; | 265 | event UpdatePrimFlags OnUpdatePrimFlags; |
266 | event UpdatePrimTexture OnUpdatePrimTexture; | 266 | event UpdatePrimTexture OnUpdatePrimTexture; |
267 | event UpdateVector OnUpdatePrimGroupPosition; | 267 | event UpdateVector OnUpdatePrimGroupPosition; |
268 | event UpdateVector OnUpdatePrimSinglePosition; | 268 | event UpdateVector OnUpdatePrimSinglePosition; |
269 | event UpdatePrimRotation OnUpdatePrimGroupRotation; | 269 | event UpdatePrimRotation OnUpdatePrimGroupRotation; |
270 | event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; | 270 | event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; |
271 | event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; | 271 | event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation; |
272 | event UpdateVector OnUpdatePrimScale; | 272 | event UpdateVector OnUpdatePrimScale; |
273 | event StatusChange OnChildAgentStatus; | 273 | event StatusChange OnChildAgentStatus; |
274 | event GenericCall2 OnStopMovement; | 274 | event GenericCall2 OnStopMovement; |
275 | event GenericCall6 OnRemoveAvatar; | 275 | event GenericCall6 OnRemoveAvatar; |
276 | 276 | ||
277 | event CreateNewInventoryItem OnCreateNewInventoryItem; | 277 | event CreateNewInventoryItem OnCreateNewInventoryItem; |
278 | event CreateInventoryFolder OnCreateNewInventoryFolder; | 278 | event CreateInventoryFolder OnCreateNewInventoryFolder; |
279 | event FetchInventoryDescendents OnFetchInventoryDescendents; | 279 | event FetchInventoryDescendents OnFetchInventoryDescendents; |
280 | event FetchInventory OnFetchInventory; | 280 | event FetchInventory OnFetchInventory; |
281 | event RequestTaskInventory OnRequestTaskInventory; | 281 | event RequestTaskInventory OnRequestTaskInventory; |
282 | event UpdateInventoryItemTransaction OnUpdateInventoryItem; | 282 | event UpdateInventoryItemTransaction OnUpdateInventoryItem; |
283 | event UDPAssetUploadRequest OnAssetUploadRequest; | 283 | event UDPAssetUploadRequest OnAssetUploadRequest; |
284 | event XferReceive OnXferReceive; | 284 | event XferReceive OnXferReceive; |
285 | event RequestXfer OnRequestXfer; | 285 | event RequestXfer OnRequestXfer; |
286 | event ConfirmXfer OnConfirmXfer; | 286 | event ConfirmXfer OnConfirmXfer; |
287 | event RezScript OnRezScript; | 287 | event RezScript OnRezScript; |
288 | event UpdateTaskInventory OnUpdateTaskInventory; | 288 | event UpdateTaskInventory OnUpdateTaskInventory; |
289 | event RemoveTaskInventory OnRemoveTaskItem; | 289 | event RemoveTaskInventory OnRemoveTaskItem; |
290 | 290 | ||
291 | event UUIDNameRequest OnNameFromUUIDRequest; | 291 | event UUIDNameRequest OnNameFromUUIDRequest; |
292 | 292 | ||
293 | event ParcelPropertiesRequest OnParcelPropertiesRequest; | 293 | event ParcelPropertiesRequest OnParcelPropertiesRequest; |
294 | event ParcelDivideRequest OnParcelDivideRequest; | 294 | event ParcelDivideRequest OnParcelDivideRequest; |
295 | event ParcelJoinRequest OnParcelJoinRequest; | 295 | event ParcelJoinRequest OnParcelJoinRequest; |
296 | event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; | 296 | event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; |
297 | event ParcelSelectObjects OnParcelSelectObjects; | 297 | event ParcelSelectObjects OnParcelSelectObjects; |
298 | event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; | 298 | event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; |
299 | event EstateOwnerMessageRequest OnEstateOwnerMessage; | 299 | event EstateOwnerMessageRequest OnEstateOwnerMessage; |
300 | 300 | ||
301 | LLVector3 StartPos | 301 | LLVector3 StartPos |
302 | { | 302 | { |
303 | get; | 303 | get; |
304 | set; | 304 | set; |
305 | } | 305 | } |
306 | 306 | ||
307 | LLUUID AgentId | 307 | LLUUID AgentId |
308 | { | 308 | { |
309 | get; | 309 | get; |
310 | } | 310 | } |
311 | 311 | ||
312 | LLUUID SessionId | 312 | LLUUID SessionId |
313 | { | 313 | { |
314 | get; | 314 | get; |
315 | } | 315 | } |
316 | 316 | ||
317 | string FirstName | 317 | string FirstName |
318 | { | 318 | { |
319 | get; | 319 | get; |
320 | } | 320 | } |
321 | 321 | ||
322 | string LastName | 322 | string LastName |
323 | { | 323 | { |
324 | get; | 324 | get; |
325 | } | 325 | } |
326 | 326 | ||
327 | uint CircuitCode | 327 | uint CircuitCode |
328 | { | 328 | { |
329 | get; | 329 | get; |
330 | set; | 330 | set; |
331 | } | 331 | } |
332 | 332 | ||
333 | void OutPacket(Packet newPack); | 333 | void OutPacket(Packet newPack); |
334 | void SendWearables(AvatarWearable[] wearables); | 334 | void SendWearables(AvatarWearable[] wearables); |
335 | void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry); | 335 | void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry); |
336 | void SendStartPingCheck(byte seq); | 336 | void SendStartPingCheck(byte seq); |
337 | void SendKillObject(ulong regionHandle, uint localID); | 337 | void SendKillObject(ulong regionHandle, uint localID); |
338 | void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId); | 338 | void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId); |
339 | void SendRegionHandshake(RegionInfo regionInfo); | 339 | void SendRegionHandshake(RegionInfo regionInfo); |
340 | void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); | 340 | void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); |
341 | void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); | 341 | void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); |
342 | void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, LLUUID imSessionID, string fromName, byte dialog, uint timeStamp); | 342 | void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, LLUUID imSessionID, string fromName, byte dialog, uint timeStamp); |
343 | void SendLayerData(float[] map); | 343 | void SendLayerData(float[] map); |
344 | void SendLayerData(int px, int py, float[] map); | 344 | void SendLayerData(int px, int py, float[] map); |
345 | void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); | 345 | void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); |
346 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); | 346 | void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); |
347 | AgentCircuitData RequestClientInfo(); | 347 | AgentCircuitData RequestClientInfo(); |
348 | void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL ); | 348 | void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL ); |
349 | void SendMapBlock(List<MapBlockData> mapBlocks); | 349 | void SendMapBlock(List<MapBlockData> mapBlocks); |
350 | void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); | 350 | void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); |
351 | void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL); | 351 | void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL); |
352 | void SendTeleportCancel(); | 352 | void SendTeleportCancel(); |
353 | void SendTeleportLocationStart(); | 353 | void SendTeleportLocationStart(); |
354 | void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); | 354 | void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); |
355 | 355 | ||
356 | void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID); | 356 | void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID); |
357 | void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity, LLQuaternion rotation); | 357 | void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity, LLQuaternion rotation); |
358 | void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations); | 358 | void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations); |
359 | 359 | ||
360 | void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); | 360 | void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); |
361 | void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation); | 361 | void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation); |
362 | void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); | 362 | void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); |
363 | 363 | ||
364 | void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items); | 364 | void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items); |
365 | void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); | 365 | void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); |
366 | void SendInventoryItemUpdate(InventoryItemBase Item); | 366 | void SendInventoryItemUpdate(InventoryItemBase Item); |
367 | void SendRemoveInventoryItem(LLUUID itemID); | 367 | void SendRemoveInventoryItem(LLUUID itemID); |
368 | void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName); | 368 | void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName); |
369 | void SendXferPacket(ulong xferID, uint packet, byte[] data); | 369 | void SendXferPacket(ulong xferID, uint packet, byte[] data); |
370 | 370 | ||
371 | void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID); | 371 | void SendPreLoadSound(LLUUID objectID, LLUUID ownerID, LLUUID soundID); |
372 | void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, byte flags); | 372 | void SendPlayAttachedSound(LLUUID soundID, LLUUID objectID, LLUUID ownerID, float gain, byte flags); |
373 | 373 | ||
374 | void SendNameReply(LLUUID profileId, string firstname, string lastname); | 374 | void SendNameReply(LLUUID profileId, string firstname, string lastname); |
375 | void SendAlertMessage(string message); | 375 | void SendAlertMessage(string message); |
376 | void SendAgentAlertMessage(string message, bool modal); | 376 | void SendAgentAlertMessage(string message, bool modal); |
377 | void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url); | 377 | void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url); |
378 | bool AddMoney( int debit ); | 378 | bool AddMoney( int debit ); |
379 | 379 | ||
380 | void SendViewerTime(int phase); | 380 | void SendViewerTime(int phase); |
381 | void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); | 381 | void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); |
382 | void SetDebug(int newDebug); | 382 | void SetDebug(int newDebug); |
383 | void InPacket(Packet NewPack); | 383 | void InPacket(Packet NewPack); |
384 | void Close(); | 384 | void Close(); |
385 | event ViewerEffectEventHandler OnViewerEffect; | 385 | event ViewerEffectEventHandler OnViewerEffect; |
386 | event Action<IClientAPI> OnLogout; | 386 | event Action<IClientAPI> OnLogout; |
387 | event Action<IClientAPI> OnConnectionClosed; | 387 | event Action<IClientAPI> OnConnectionClosed; |
388 | void SendLogoutPacket(); | 388 | void SendLogoutPacket(); |
389 | } | 389 | } |
390 | } | 390 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IPlugin.cs b/OpenSim/Framework/General/IPlugin.cs index efd94c9..6926ef4 100644 --- a/OpenSim/Framework/General/Interfaces/IPlugin.cs +++ b/OpenSim/Framework/General/IPlugin.cs | |||
@@ -1,57 +1,57 @@ | |||
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 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | namespace OpenSim.Framework.Interfaces | 33 | namespace OpenSim.Framework |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// This interface, describes a generic plugin | 36 | /// This interface, describes a generic plugin |
37 | /// </summary> | 37 | /// </summary> |
38 | public interface IPlugin | 38 | public interface IPlugin |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// Returns the plugin version | 41 | /// Returns the plugin version |
42 | /// </summary> | 42 | /// </summary> |
43 | /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> | 43 | /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> |
44 | string Version { get; } | 44 | string Version { get; } |
45 | 45 | ||
46 | /// <summary> | 46 | /// <summary> |
47 | /// Returns the plugin name | 47 | /// Returns the plugin name |
48 | /// </summary> | 48 | /// </summary> |
49 | /// <returns>Plugin name, eg MySQL User Provider</returns> | 49 | /// <returns>Plugin name, eg MySQL User Provider</returns> |
50 | string Name { get; } | 50 | string Name { get; } |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Initialises the plugin (artificial constructor) | 53 | /// Initialises the plugin (artificial constructor) |
54 | /// </summary> | 54 | /// </summary> |
55 | void Initialise(); | 55 | void Initialise(); |
56 | } | 56 | } |
57 | } | 57 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IScene.cs b/OpenSim/Framework/General/IScene.cs index e3e65f1..9f03a04 100644 --- a/OpenSim/Framework/General/Interfaces/IScene.cs +++ b/OpenSim/Framework/General/IScene.cs | |||
@@ -1,47 +1,47 @@ | |||
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 libsecondlife; | 28 | using libsecondlife; |
29 | using OpenSim.Framework.Types; | 29 | using OpenSim.Framework; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Interfaces | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
33 | public interface IScene | 33 | public interface IScene |
34 | { | 34 | { |
35 | void AddNewClient(IClientAPI client, bool child); | 35 | void AddNewClient(IClientAPI client, bool child); |
36 | void RemoveClient(LLUUID agentID); | 36 | void RemoveClient(LLUUID agentID); |
37 | 37 | ||
38 | RegionInfo RegionInfo { get; } | 38 | RegionInfo RegionInfo { get; } |
39 | object SyncRoot { get; } | 39 | object SyncRoot { get; } |
40 | uint NextLocalId { get; } | 40 | uint NextLocalId { get; } |
41 | 41 | ||
42 | ClientManager ClientManager | 42 | ClientManager ClientManager |
43 | { | 43 | { |
44 | get; | 44 | get; |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IUserData.cs b/OpenSim/Framework/General/IUserData.cs index bb3abe0..e1e9c99 100644 --- a/OpenSim/Framework/General/Interfaces/IUserData.cs +++ b/OpenSim/Framework/General/IUserData.cs | |||
@@ -1,135 +1,135 @@ | |||
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 libsecondlife; | 28 | using libsecondlife; |
29 | using OpenSim.Framework.Types; | 29 | using OpenSim.Framework; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// An interface for connecting to user storage servers. | 34 | /// An interface for connecting to user storage servers. |
35 | /// </summary> | 35 | /// </summary> |
36 | public interface IUserData | 36 | public interface IUserData |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// Returns a user profile from a database via their UUID | 39 | /// Returns a user profile from a database via their UUID |
40 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="user">The accounts UUID</param> | 41 | /// <param name="user">The accounts UUID</param> |
42 | /// <returns>The user data profile</returns> | 42 | /// <returns>The user data profile</returns> |
43 | UserProfileData GetUserByUUID(LLUUID user); | 43 | UserProfileData GetUserByUUID(LLUUID user); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Returns a users profile by searching their username | 46 | /// Returns a users profile by searching their username |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="name">The users username</param> | 48 | /// <param name="name">The users username</param> |
49 | /// <returns>The user data profile</returns> | 49 | /// <returns>The user data profile</returns> |
50 | UserProfileData GetUserByName(string name); | 50 | UserProfileData GetUserByName(string name); |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Returns a users profile by searching their username parts | 53 | /// Returns a users profile by searching their username parts |
54 | /// </summary> | 54 | /// </summary> |
55 | /// <param name="fname">Account firstname</param> | 55 | /// <param name="fname">Account firstname</param> |
56 | /// <param name="lname">Account lastname</param> | 56 | /// <param name="lname">Account lastname</param> |
57 | /// <returns>The user data profile</returns> | 57 | /// <returns>The user data profile</returns> |
58 | UserProfileData GetUserByName(string fname, string lname); | 58 | UserProfileData GetUserByName(string fname, string lname); |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Returns the current agent for a user searching by it's UUID | 61 | /// Returns the current agent for a user searching by it's UUID |
62 | /// </summary> | 62 | /// </summary> |
63 | /// <param name="user">The users UUID</param> | 63 | /// <param name="user">The users UUID</param> |
64 | /// <returns>The current agent session</returns> | 64 | /// <returns>The current agent session</returns> |
65 | UserAgentData GetAgentByUUID(LLUUID user); | 65 | UserAgentData GetAgentByUUID(LLUUID user); |
66 | 66 | ||
67 | /// <summary> | 67 | /// <summary> |
68 | /// Returns the current session agent for a user searching by username | 68 | /// Returns the current session agent for a user searching by username |
69 | /// </summary> | 69 | /// </summary> |
70 | /// <param name="name">The users account name</param> | 70 | /// <param name="name">The users account name</param> |
71 | /// <returns>The current agent session</returns> | 71 | /// <returns>The current agent session</returns> |
72 | UserAgentData GetAgentByName(string name); | 72 | UserAgentData GetAgentByName(string name); |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Returns the current session agent for a user searching by username parts | 75 | /// Returns the current session agent for a user searching by username parts |
76 | /// </summary> | 76 | /// </summary> |
77 | /// <param name="fname">The users first account name</param> | 77 | /// <param name="fname">The users first account name</param> |
78 | /// <param name="lname">The users account surname</param> | 78 | /// <param name="lname">The users account surname</param> |
79 | /// <returns>The current agent session</returns> | 79 | /// <returns>The current agent session</returns> |
80 | UserAgentData GetAgentByName(string fname, string lname); | 80 | UserAgentData GetAgentByName(string fname, string lname); |
81 | 81 | ||
82 | /// <summary> | 82 | /// <summary> |
83 | /// Adds a new User profile to the database | 83 | /// Adds a new User profile to the database |
84 | /// </summary> | 84 | /// </summary> |
85 | /// <param name="user">UserProfile to add</param> | 85 | /// <param name="user">UserProfile to add</param> |
86 | void AddNewUserProfile(UserProfileData user); | 86 | void AddNewUserProfile(UserProfileData user); |
87 | 87 | ||
88 | /// <summary> | 88 | /// <summary> |
89 | /// Updates an existing user profile | 89 | /// Updates an existing user profile |
90 | /// </summary> | 90 | /// </summary> |
91 | /// <param name="user">UserProfile to update</param> | 91 | /// <param name="user">UserProfile to update</param> |
92 | bool UpdateUserProfile(UserProfileData user); | 92 | bool UpdateUserProfile(UserProfileData user); |
93 | 93 | ||
94 | /// <summary> | 94 | /// <summary> |
95 | /// Adds a new agent to the database | 95 | /// Adds a new agent to the database |
96 | /// </summary> | 96 | /// </summary> |
97 | /// <param name="agent">The agent to add</param> | 97 | /// <param name="agent">The agent to add</param> |
98 | void AddNewUserAgent(UserAgentData agent); | 98 | void AddNewUserAgent(UserAgentData agent); |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
101 | /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) | 101 | /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) |
102 | /// </summary> | 102 | /// </summary> |
103 | /// <param name="from">The account to transfer from</param> | 103 | /// <param name="from">The account to transfer from</param> |
104 | /// <param name="to">The account to transfer to</param> | 104 | /// <param name="to">The account to transfer to</param> |
105 | /// <param name="amount">The amount to transfer</param> | 105 | /// <param name="amount">The amount to transfer</param> |
106 | /// <returns>Successful?</returns> | 106 | /// <returns>Successful?</returns> |
107 | bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); | 107 | bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount); |
108 | 108 | ||
109 | /// <summary> | 109 | /// <summary> |
110 | /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account. | 110 | /// Attempts to move inventory between accounts, if inventory is copyable it will be copied into the target account. |
111 | /// </summary> | 111 | /// </summary> |
112 | /// <param name="from">User to transfer from</param> | 112 | /// <param name="from">User to transfer from</param> |
113 | /// <param name="to">User to transfer to</param> | 113 | /// <param name="to">User to transfer to</param> |
114 | /// <param name="inventory">Specified inventory item</param> | 114 | /// <param name="inventory">Specified inventory item</param> |
115 | /// <returns>Successful?</returns> | 115 | /// <returns>Successful?</returns> |
116 | bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); | 116 | bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory); |
117 | 117 | ||
118 | /// <summary> | 118 | /// <summary> |
119 | /// Returns the plugin version | 119 | /// Returns the plugin version |
120 | /// </summary> | 120 | /// </summary> |
121 | /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> | 121 | /// <returns>Plugin version in MAJOR.MINOR.REVISION.BUILD format</returns> |
122 | string GetVersion(); | 122 | string GetVersion(); |
123 | 123 | ||
124 | /// <summary> | 124 | /// <summary> |
125 | /// Returns the plugin name | 125 | /// Returns the plugin name |
126 | /// </summary> | 126 | /// </summary> |
127 | /// <returns>Plugin name, eg MySQL User Provider</returns> | 127 | /// <returns>Plugin name, eg MySQL User Provider</returns> |
128 | string getName(); | 128 | string getName(); |
129 | 129 | ||
130 | /// <summary> | 130 | /// <summary> |
131 | /// Initialises the plugin (artificial constructor) | 131 | /// Initialises the plugin (artificial constructor) |
132 | /// </summary> | 132 | /// </summary> |
133 | void Initialise(); | 133 | void Initialise(); |
134 | } | 134 | } |
135 | } | 135 | } |
diff --git a/OpenSim/Framework/General/Interfaces/IUserService.cs b/OpenSim/Framework/General/IUserService.cs index f8c76af..400c12b 100644 --- a/OpenSim/Framework/General/Interfaces/IUserService.cs +++ b/OpenSim/Framework/General/IUserService.cs | |||
@@ -1,49 +1,49 @@ | |||
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 libsecondlife; | 28 | using libsecondlife; |
29 | using OpenSim.Framework.Types; | 29 | using OpenSim.Framework; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Interfaces | 31 | namespace OpenSim.Framework.Interfaces |
32 | { | 32 | { |
33 | public interface IUserService | 33 | public interface IUserService |
34 | { | 34 | { |
35 | UserProfileData GetUserProfile(string firstName, string lastName); | 35 | UserProfileData GetUserProfile(string firstName, string lastName); |
36 | UserProfileData GetUserProfile(string name); | 36 | UserProfileData GetUserProfile(string name); |
37 | UserProfileData GetUserProfile(LLUUID userId); | 37 | UserProfileData GetUserProfile(LLUUID userId); |
38 | void clearUserAgent(LLUUID avatarID); | 38 | void clearUserAgent(LLUUID avatarID); |
39 | 39 | ||
40 | UserProfileData SetupMasterUser(string firstName, string lastName); | 40 | UserProfileData SetupMasterUser(string firstName, string lastName); |
41 | UserProfileData SetupMasterUser(string firstName, string lastName, string password); | 41 | UserProfileData SetupMasterUser(string firstName, string lastName, string password); |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// | 44 | /// |
45 | /// </summary> | 45 | /// </summary> |
46 | /// <param name="user"></param> | 46 | /// <param name="user"></param> |
47 | void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY); | 47 | void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY); |
48 | } | 48 | } |
49 | } \ No newline at end of file | 49 | } \ No newline at end of file |