diff options
author | Diva Canto | 2009-08-12 20:40:49 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-12 20:40:49 -0700 |
commit | b0292d59a54fab6f7e825d6f0e5f0517d56243a6 (patch) | |
tree | 3c49fe36db9167babb7c8c44758a9755cd02b271 | |
parent | Redirected all calls to CachedUserProfile methods to the inventory service. R... (diff) | |
parent | minor:comments (diff) | |
download | opensim-SC-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.zip opensim-SC-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.tar.gz opensim-SC-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.tar.bz2 opensim-SC-b0292d59a54fab6f7e825d6f0e5f0517d56243a6.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
19 files changed, 484 insertions, 13 deletions
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs index a964989..f882d5d 100644 --- a/OpenSim/Client/Linden/LLClientStackModule.cs +++ b/OpenSim/Client/Linden/LLClientStackModule.cs | |||
@@ -41,12 +41,18 @@ using OpenSim.Region.Framework.Interfaces; | |||
41 | 41 | ||
42 | namespace OpenSim.Client.Linden | 42 | namespace OpenSim.Client.Linden |
43 | { | 43 | { |
44 | /// <summary> | ||
45 | /// Linden UDP Stack Region Module | ||
46 | /// </summary> | ||
44 | public class LLClientStackModule : INonSharedRegionModule | 47 | public class LLClientStackModule : INonSharedRegionModule |
45 | { | 48 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 50 | ||
48 | #region IRegionModule Members | 51 | #region IRegionModule Members |
49 | 52 | ||
53 | /// <summary> | ||
54 | /// Scene that contains the region's data | ||
55 | /// </summary> | ||
50 | protected Scene m_scene; | 56 | protected Scene m_scene; |
51 | protected bool m_createClientStack = false; | 57 | protected bool m_createClientStack = false; |
52 | protected IClientNetworkServer m_clientServer; | 58 | protected IClientNetworkServer m_clientServer; |
diff --git a/OpenSim/Framework/ACL.cs b/OpenSim/Framework/ACL.cs index 9d7827e..3b1c0f0 100644 --- a/OpenSim/Framework/ACL.cs +++ b/OpenSim/Framework/ACL.cs | |||
@@ -46,6 +46,11 @@ namespace OpenSim.Framework | |||
46 | private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>(); | 46 | private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>(); |
47 | private Dictionary<string, Role> Roles = new Dictionary<string, Role>(); | 47 | private Dictionary<string, Role> Roles = new Dictionary<string, Role>(); |
48 | 48 | ||
49 | /// <summary> | ||
50 | /// Adds a new role | ||
51 | /// </summary> | ||
52 | /// <param name="role"></param> | ||
53 | /// <returns></returns> | ||
49 | public ACL AddRole(Role role) | 54 | public ACL AddRole(Role role) |
50 | { | 55 | { |
51 | if (Roles.ContainsKey(role.Name)) | 56 | if (Roles.ContainsKey(role.Name)) |
@@ -56,6 +61,11 @@ namespace OpenSim.Framework | |||
56 | return this; | 61 | return this; |
57 | } | 62 | } |
58 | 63 | ||
64 | /// <summary> | ||
65 | /// Adds a new resource | ||
66 | /// </summary> | ||
67 | /// <param name="resource"></param> | ||
68 | /// <returns></returns> | ||
59 | public ACL AddResource(Resource resource) | 69 | public ACL AddResource(Resource resource) |
60 | { | 70 | { |
61 | Resources.Add(resource.Name, resource); | 71 | Resources.Add(resource.Name, resource); |
@@ -63,6 +73,12 @@ namespace OpenSim.Framework | |||
63 | return this; | 73 | return this; |
64 | } | 74 | } |
65 | 75 | ||
76 | /// <summary> | ||
77 | /// Permision for user/roll on a resource | ||
78 | /// </summary> | ||
79 | /// <param name="role"></param> | ||
80 | /// <param name="resource"></param> | ||
81 | /// <returns></returns> | ||
66 | public Permission HasPermission(string role, string resource) | 82 | public Permission HasPermission(string role, string resource) |
67 | { | 83 | { |
68 | if (!Roles.ContainsKey(role)) | 84 | if (!Roles.ContainsKey(role)) |
@@ -234,6 +250,9 @@ namespace OpenSim.Framework | |||
234 | 250 | ||
235 | #region Tests | 251 | #region Tests |
236 | 252 | ||
253 | /// <summary> | ||
254 | /// ACL Test class | ||
255 | /// </summary> | ||
237 | internal class ACLTester | 256 | internal class ACLTester |
238 | { | 257 | { |
239 | public ACLTester() | 258 | public ACLTester() |
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index c38f0c3..6472f31 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
@@ -32,26 +32,83 @@ using OpenMetaverse.StructuredData; | |||
32 | 32 | ||
33 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
34 | { | 34 | { |
35 | /// <summary> | ||
36 | /// Circuit data for an agent. Connection information shared between | ||
37 | /// regions that accept UDP connections from a client | ||
38 | /// </summary> | ||
35 | public class AgentCircuitData | 39 | public class AgentCircuitData |
36 | { | 40 | { |
41 | /// <summary> | ||
42 | /// Avatar Unique Agent Identifier | ||
43 | /// </summary> | ||
37 | public UUID AgentID; | 44 | public UUID AgentID; |
45 | |||
46 | /// <summary> | ||
47 | /// Avatar's Appearance | ||
48 | /// </summary> | ||
38 | public AvatarAppearance Appearance; | 49 | public AvatarAppearance Appearance; |
50 | |||
51 | /// <summary> | ||
52 | /// Agent's root inventory folder | ||
53 | /// </summary> | ||
39 | public UUID BaseFolder; | 54 | public UUID BaseFolder; |
55 | |||
56 | /// <summary> | ||
57 | /// Base Caps path for user | ||
58 | /// </summary> | ||
40 | public string CapsPath = String.Empty; | 59 | public string CapsPath = String.Empty; |
60 | |||
61 | /// <summary> | ||
62 | /// Seed caps for neighbor regions that the user can see into | ||
63 | /// </summary> | ||
41 | public Dictionary<ulong, string> ChildrenCapSeeds; | 64 | public Dictionary<ulong, string> ChildrenCapSeeds; |
65 | |||
66 | /// <summary> | ||
67 | /// Root agent, or Child agent | ||
68 | /// </summary> | ||
42 | public bool child; | 69 | public bool child; |
70 | |||
71 | /// <summary> | ||
72 | /// Number given to the client when they log-in that they provide | ||
73 | /// as credentials to the UDP server | ||
74 | /// </summary> | ||
43 | public uint circuitcode; | 75 | public uint circuitcode; |
76 | |||
77 | /// <summary> | ||
78 | /// Agent's account first name | ||
79 | /// </summary> | ||
44 | public string firstname; | 80 | public string firstname; |
45 | public UUID InventoryFolder; | 81 | public UUID InventoryFolder; |
82 | |||
83 | /// <summary> | ||
84 | /// Agent's account last name | ||
85 | /// </summary> | ||
46 | public string lastname; | 86 | public string lastname; |
87 | |||
88 | /// <summary> | ||
89 | /// Random Unique GUID for this session. Client gets this at login and it's | ||
90 | /// only supposed to be disclosed over secure channels | ||
91 | /// </summary> | ||
47 | public UUID SecureSessionID; | 92 | public UUID SecureSessionID; |
93 | |||
94 | /// <summary> | ||
95 | /// Non secure Session ID | ||
96 | /// </summary> | ||
48 | public UUID SessionID; | 97 | public UUID SessionID; |
98 | |||
99 | /// <summary> | ||
100 | /// Position the Agent's Avatar starts in the region | ||
101 | /// </summary> | ||
49 | public Vector3 startpos; | 102 | public Vector3 startpos; |
50 | 103 | ||
51 | public AgentCircuitData() | 104 | public AgentCircuitData() |
52 | { | 105 | { |
53 | } | 106 | } |
54 | 107 | ||
108 | /// <summary> | ||
109 | /// Create AgentCircuitData from a Serializable AgentCircuitData | ||
110 | /// </summary> | ||
111 | /// <param name="cAgent"></param> | ||
55 | public AgentCircuitData(sAgentCircuitData cAgent) | 112 | public AgentCircuitData(sAgentCircuitData cAgent) |
56 | { | 113 | { |
57 | AgentID = new UUID(cAgent.AgentID); | 114 | AgentID = new UUID(cAgent.AgentID); |
@@ -68,6 +125,10 @@ namespace OpenSim.Framework | |||
68 | ChildrenCapSeeds = cAgent.ChildrenCapSeeds; | 125 | ChildrenCapSeeds = cAgent.ChildrenCapSeeds; |
69 | } | 126 | } |
70 | 127 | ||
128 | /// <summary> | ||
129 | /// Pack AgentCircuitData into an OSDMap for transmission over LLSD XML or LLSD json | ||
130 | /// </summary> | ||
131 | /// <returns>map of the agent circuit data</returns> | ||
71 | public OSDMap PackAgentCircuitData() | 132 | public OSDMap PackAgentCircuitData() |
72 | { | 133 | { |
73 | OSDMap args = new OSDMap(); | 134 | OSDMap args = new OSDMap(); |
@@ -98,6 +159,10 @@ namespace OpenSim.Framework | |||
98 | return args; | 159 | return args; |
99 | } | 160 | } |
100 | 161 | ||
162 | /// <summary> | ||
163 | /// Unpack agent circuit data map into an AgentCiruitData object | ||
164 | /// </summary> | ||
165 | /// <param name="args"></param> | ||
101 | public void UnpackAgentCircuitData(OSDMap args) | 166 | public void UnpackAgentCircuitData(OSDMap args) |
102 | { | 167 | { |
103 | if (args["agent_id"] != null) | 168 | if (args["agent_id"] != null) |
@@ -150,6 +215,9 @@ namespace OpenSim.Framework | |||
150 | } | 215 | } |
151 | } | 216 | } |
152 | 217 | ||
218 | /// <summary> | ||
219 | /// Serializable Agent Circuit Data | ||
220 | /// </summary> | ||
153 | [Serializable] | 221 | [Serializable] |
154 | public class sAgentCircuitData | 222 | public class sAgentCircuitData |
155 | { | 223 | { |
diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs index a19795d..7b9ec68 100644 --- a/OpenSim/Framework/AgentUpdateArgs.cs +++ b/OpenSim/Framework/AgentUpdateArgs.cs | |||
@@ -30,18 +30,52 @@ using OpenMetaverse; | |||
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
33 | /// <summary> | ||
34 | /// Client provided parameters for avatar movement | ||
35 | /// </summary> | ||
33 | public class AgentUpdateArgs : EventArgs | 36 | public class AgentUpdateArgs : EventArgs |
34 | { | 37 | { |
38 | /// <summary> | ||
39 | /// Agent's unique ID | ||
40 | /// </summary> | ||
35 | public UUID AgentID; | 41 | public UUID AgentID; |
42 | |||
43 | /// <summary> | ||
44 | /// Rotation of the avatar's body | ||
45 | /// </summary> | ||
36 | public Quaternion BodyRotation; | 46 | public Quaternion BodyRotation; |
47 | |||
48 | /// <summary> | ||
49 | /// AT portion of the camera matrix | ||
50 | /// </summary> | ||
37 | public Vector3 CameraAtAxis; | 51 | public Vector3 CameraAtAxis; |
52 | |||
53 | /// <summary> | ||
54 | /// Position of the camera in the Scene | ||
55 | /// </summary> | ||
38 | public Vector3 CameraCenter; | 56 | public Vector3 CameraCenter; |
39 | public Vector3 CameraLeftAxis; | 57 | public Vector3 CameraLeftAxis; |
40 | public Vector3 CameraUpAxis; | 58 | public Vector3 CameraUpAxis; |
59 | |||
60 | /// <summary> | ||
61 | /// Bitflag field for agent movement. Fly, forward, backward, turn left, turn right, go up, go down, Straffe, etc. | ||
62 | /// </summary> | ||
41 | public uint ControlFlags; | 63 | public uint ControlFlags; |
64 | |||
65 | /// <summary> | ||
66 | /// Agent's client Draw distance setting | ||
67 | /// </summary> | ||
42 | public float Far; | 68 | public float Far; |
43 | public byte Flags; | 69 | public byte Flags; |
70 | |||
71 | /// <summary> | ||
72 | /// Rotation of the avatar's head | ||
73 | /// </summary> | ||
44 | public Quaternion HeadRotation; | 74 | public Quaternion HeadRotation; |
75 | |||
76 | /// <summary> | ||
77 | /// Session Id | ||
78 | /// </summary> | ||
45 | public UUID SessionID; | 79 | public UUID SessionID; |
46 | public byte State; | 80 | public byte State; |
47 | } | 81 | } |
diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs index 9f86513..232f5a1 100644 --- a/OpenSim/Framework/Animation.cs +++ b/OpenSim/Framework/Animation.cs | |||
@@ -31,10 +31,17 @@ using OpenMetaverse.StructuredData; | |||
31 | 31 | ||
32 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
33 | { | 33 | { |
34 | /// <summary> | ||
35 | /// Information about an Animation | ||
36 | /// </summary> | ||
34 | [Serializable] | 37 | [Serializable] |
35 | public class Animation | 38 | public class Animation |
36 | { | 39 | { |
37 | private UUID animID; | 40 | private UUID animID; |
41 | |||
42 | /// <summary> | ||
43 | /// ID of Animation | ||
44 | /// </summary> | ||
38 | public UUID AnimID | 45 | public UUID AnimID |
39 | { | 46 | { |
40 | get { return animID; } | 47 | get { return animID; } |
@@ -49,6 +56,10 @@ namespace OpenSim.Framework | |||
49 | } | 56 | } |
50 | 57 | ||
51 | private UUID objectID; | 58 | private UUID objectID; |
59 | |||
60 | /// <summary> | ||
61 | /// Unique ID of object that is being animated | ||
62 | /// </summary> | ||
52 | public UUID ObjectID | 63 | public UUID ObjectID |
53 | { | 64 | { |
54 | get { return objectID; } | 65 | get { return objectID; } |
@@ -59,6 +70,12 @@ namespace OpenSim.Framework | |||
59 | { | 70 | { |
60 | } | 71 | } |
61 | 72 | ||
73 | /// <summary> | ||
74 | /// Creates an Animation based on the data | ||
75 | /// </summary> | ||
76 | /// <param name="animID">UUID ID of animation</param> | ||
77 | /// <param name="sequenceNum"></param> | ||
78 | /// <param name="objectID">ID of object to be animated</param> | ||
62 | public Animation(UUID animID, int sequenceNum, UUID objectID) | 79 | public Animation(UUID animID, int sequenceNum, UUID objectID) |
63 | { | 80 | { |
64 | this.animID = animID; | 81 | this.animID = animID; |
@@ -66,11 +83,20 @@ namespace OpenSim.Framework | |||
66 | this.objectID = objectID; | 83 | this.objectID = objectID; |
67 | } | 84 | } |
68 | 85 | ||
86 | /// <summary> | ||
87 | /// Animation from OSDMap from LLSD XML or LLSD json | ||
88 | /// </summary> | ||
89 | /// <param name="args"></param> | ||
69 | public Animation(OSDMap args) | 90 | public Animation(OSDMap args) |
70 | { | 91 | { |
71 | UnpackUpdateMessage(args); | 92 | UnpackUpdateMessage(args); |
72 | } | 93 | } |
73 | 94 | ||
95 | |||
96 | /// <summary> | ||
97 | /// Pack this object up as an OSDMap for transferring via LLSD XML or LLSD json | ||
98 | /// </summary> | ||
99 | /// <returns></returns> | ||
74 | public OSDMap PackUpdateMessage() | 100 | public OSDMap PackUpdateMessage() |
75 | { | 101 | { |
76 | OSDMap anim = new OSDMap(); | 102 | OSDMap anim = new OSDMap(); |
@@ -80,6 +106,10 @@ namespace OpenSim.Framework | |||
80 | return anim; | 106 | return anim; |
81 | } | 107 | } |
82 | 108 | ||
109 | /// <summary> | ||
110 | /// Fill object with data from OSDMap | ||
111 | /// </summary> | ||
112 | /// <param name="args"></param> | ||
83 | public void UnpackUpdateMessage(OSDMap args) | 113 | public void UnpackUpdateMessage(OSDMap args) |
84 | { | 114 | { |
85 | if (args["animation"] != null) | 115 | if (args["animation"] != null) |
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 614670c..9679ff2 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
@@ -31,10 +31,20 @@ using OpenMetaverse; | |||
31 | 31 | ||
32 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
33 | { | 33 | { |
34 | /// <summary> | ||
35 | /// Asset class. All Assets are reference by this class or a class derived from this class | ||
36 | /// </summary> | ||
34 | [Serializable] | 37 | [Serializable] |
35 | public class AssetBase | 38 | public class AssetBase |
36 | { | 39 | { |
40 | /// <summary> | ||
41 | /// Data of the Asset | ||
42 | /// </summary> | ||
37 | private byte[] m_data; | 43 | private byte[] m_data; |
44 | |||
45 | /// <summary> | ||
46 | /// Meta Data of the Asset | ||
47 | /// </summary> | ||
38 | private AssetMetadata m_metadata; | 48 | private AssetMetadata m_metadata; |
39 | 49 | ||
40 | public AssetBase() | 50 | public AssetBase() |
@@ -71,6 +81,9 @@ namespace OpenSim.Framework | |||
71 | 81 | ||
72 | } | 82 | } |
73 | 83 | ||
84 | /// <summary> | ||
85 | /// Checks if this asset is a binary or text asset | ||
86 | /// </summary> | ||
74 | public bool IsBinaryAsset | 87 | public bool IsBinaryAsset |
75 | { | 88 | { |
76 | get | 89 | get |
@@ -102,12 +115,17 @@ namespace OpenSim.Framework | |||
102 | set { m_data = value; } | 115 | set { m_data = value; } |
103 | } | 116 | } |
104 | 117 | ||
118 | /// <summary> | ||
119 | /// Asset UUID | ||
120 | /// </summary> | ||
105 | public UUID FullID | 121 | public UUID FullID |
106 | { | 122 | { |
107 | get { return m_metadata.FullID; } | 123 | get { return m_metadata.FullID; } |
108 | set { m_metadata.FullID = value; } | 124 | set { m_metadata.FullID = value; } |
109 | } | 125 | } |
110 | 126 | /// <summary> | |
127 | /// Asset MetaData ID (transferring from UUID to string ID) | ||
128 | /// </summary> | ||
111 | public string ID | 129 | public string ID |
112 | { | 130 | { |
113 | get { return m_metadata.ID; } | 131 | get { return m_metadata.ID; } |
@@ -126,18 +144,27 @@ namespace OpenSim.Framework | |||
126 | set { m_metadata.Description = value; } | 144 | set { m_metadata.Description = value; } |
127 | } | 145 | } |
128 | 146 | ||
147 | /// <summary> | ||
148 | /// (sbyte) AssetType enum | ||
149 | /// </summary> | ||
129 | public sbyte Type | 150 | public sbyte Type |
130 | { | 151 | { |
131 | get { return m_metadata.Type; } | 152 | get { return m_metadata.Type; } |
132 | set { m_metadata.Type = value; } | 153 | set { m_metadata.Type = value; } |
133 | } | 154 | } |
134 | 155 | ||
156 | /// <summary> | ||
157 | /// Is this a region only asset, or does this exist on the asset server also | ||
158 | /// </summary> | ||
135 | public bool Local | 159 | public bool Local |
136 | { | 160 | { |
137 | get { return m_metadata.Local; } | 161 | get { return m_metadata.Local; } |
138 | set { m_metadata.Local = value; } | 162 | set { m_metadata.Local = value; } |
139 | } | 163 | } |
140 | 164 | ||
165 | /// <summary> | ||
166 | /// Is this asset going to be saved to the asset database? | ||
167 | /// </summary> | ||
141 | public bool Temporary | 168 | public bool Temporary |
142 | { | 169 | { |
143 | get { return m_metadata.Temporary; } | 170 | get { return m_metadata.Temporary; } |
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 6a07bc9..7270f32 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -28,14 +28,13 @@ | |||
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.Runtime.Serialization; | ||
32 | using System.Security.Permissions; | ||
33 | using OpenMetaverse; | 31 | using OpenMetaverse; |
34 | using log4net; | ||
35 | using System.Reflection; | ||
36 | 32 | ||
37 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
38 | { | 34 | { |
35 | /// <summary> | ||
36 | /// Contains the Avatar's Appearance and methods to manipulate the appearance. | ||
37 | /// </summary> | ||
39 | public class AvatarAppearance | 38 | public class AvatarAppearance |
40 | { | 39 | { |
41 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs index 0e8602d..200c054 100644 --- a/OpenSim/Framework/AvatarPickerAvatar.cs +++ b/OpenSim/Framework/AvatarPickerAvatar.cs | |||
@@ -29,10 +29,24 @@ using OpenMetaverse; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework | 30 | namespace OpenSim.Framework |
31 | { | 31 | { |
32 | /// <summary> | ||
33 | /// Avatar returned by the Avatar Picker request | ||
34 | /// </summary> | ||
32 | public class AvatarPickerAvatar | 35 | public class AvatarPickerAvatar |
33 | { | 36 | { |
37 | /// <summary> | ||
38 | /// Avatar's Unique ID | ||
39 | /// </summary> | ||
34 | public UUID AvatarID; | 40 | public UUID AvatarID; |
41 | |||
42 | /// <summary> | ||
43 | /// Avatar's Account first name | ||
44 | /// </summary> | ||
35 | public string firstName; | 45 | public string firstName; |
46 | |||
47 | /// <summary> | ||
48 | /// Avatar's Account last name | ||
49 | /// </summary> | ||
36 | public string lastName; | 50 | public string lastName; |
37 | } | 51 | } |
38 | } | 52 | } |
diff --git a/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs b/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs index 8fd21d7..54835da 100644 --- a/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs +++ b/OpenSim/Framework/AvatarPickerReplyAgentDataArgs.cs | |||
@@ -30,9 +30,19 @@ using OpenMetaverse; | |||
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
33 | /// <summary> | ||
34 | /// Args to return to a client that queries picker data | ||
35 | /// </summary> | ||
33 | public class AvatarPickerReplyAgentDataArgs : EventArgs | 36 | public class AvatarPickerReplyAgentDataArgs : EventArgs |
34 | { | 37 | { |
38 | /// <summary> | ||
39 | /// Unique Agent ID | ||
40 | /// </summary> | ||
35 | public UUID AgentID; | 41 | public UUID AgentID; |
42 | |||
43 | /// <summary> | ||
44 | /// ID of query user submitted | ||
45 | /// </summary> | ||
36 | public UUID QueryID; | 46 | public UUID QueryID; |
37 | } | 47 | } |
38 | } | 48 | } |
diff --git a/OpenSim/Framework/Culture.cs b/OpenSim/Framework/Culture.cs index c76841d..2066794 100644 --- a/OpenSim/Framework/Culture.cs +++ b/OpenSim/Framework/Culture.cs | |||
@@ -45,6 +45,9 @@ namespace OpenSim.Framework | |||
45 | get { return m_cultureInfo; } | 45 | get { return m_cultureInfo; } |
46 | } | 46 | } |
47 | 47 | ||
48 | /// <summary> | ||
49 | /// Set Culture to en-US to make string processing of numbers simpler. | ||
50 | /// </summary> | ||
48 | public static void SetCurrentCulture() | 51 | public static void SetCurrentCulture() |
49 | { | 52 | { |
50 | Thread.CurrentThread.CurrentCulture = m_cultureInfo; | 53 | Thread.CurrentThread.CurrentCulture = m_cultureInfo; |
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index d6afb95..94c0d3b 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -31,6 +31,9 @@ using OpenMetaverse; | |||
31 | 31 | ||
32 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
33 | { | 33 | { |
34 | /// <summary> | ||
35 | /// Details of a Parcel of land | ||
36 | /// </summary> | ||
34 | public class LandData | 37 | public class LandData |
35 | { | 38 | { |
36 | private Vector3 _AABBMax = new Vector3(); | 39 | private Vector3 _AABBMax = new Vector3(); |
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 2a97528..7a244ff 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -443,7 +443,7 @@ namespace OpenSim.Framework.Servers | |||
443 | string inputLine; | 443 | string inputLine; |
444 | int strcmp; | 444 | int strcmp; |
445 | 445 | ||
446 | if (File.Exists( gitCommitFileName)) | 446 | if (File.Exists(gitCommitFileName)) |
447 | { | 447 | { |
448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); | 448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); |
449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); | 449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); |
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index ad157c6..df80290 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -36,25 +36,47 @@ using OpenSim.Framework.Console; | |||
36 | 36 | ||
37 | namespace OpenSim | 37 | namespace OpenSim |
38 | { | 38 | { |
39 | /// <summary> | ||
40 | /// Starting class for the OpenSimulator Region | ||
41 | /// </summary> | ||
39 | public class Application | 42 | public class Application |
40 | { | 43 | { |
44 | /// <summary> | ||
45 | /// Text Console Logger | ||
46 | /// </summary> | ||
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 48 | ||
49 | /// <summary> | ||
50 | /// Path to the main ini Configuration file | ||
51 | /// </summary> | ||
43 | public static string iniFilePath = ""; | 52 | public static string iniFilePath = ""; |
44 | 53 | ||
54 | /// <summary> | ||
55 | /// Save Crashes in the bin/crashes folder. Configurable with m_crashDir | ||
56 | /// </summary> | ||
45 | public static bool m_saveCrashDumps = false; | 57 | public static bool m_saveCrashDumps = false; |
58 | |||
59 | /// <summary> | ||
60 | /// Directory to save crash reports to. Relative to bin/ | ||
61 | /// </summary> | ||
46 | public static string m_crashDir = "crashes"; | 62 | public static string m_crashDir = "crashes"; |
47 | 63 | ||
64 | /// <summary> | ||
65 | /// Instance of the OpenSim class. This could be OpenSim or OpenSimBackground depending on the configuration | ||
66 | /// </summary> | ||
48 | protected static OpenSimBase m_sim = null; | 67 | protected static OpenSimBase m_sim = null; |
49 | 68 | ||
50 | //could move our main function into OpenSimMain and kill this class | 69 | //could move our main function into OpenSimMain and kill this class |
51 | public static void Main(string[] args) | 70 | public static void Main(string[] args) |
52 | { | 71 | { |
53 | // First line | 72 | // First line, hook the appdomain to the crash reporter |
54 | AppDomain.CurrentDomain.UnhandledException += | 73 | AppDomain.CurrentDomain.UnhandledException += |
55 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); | 74 | new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
56 | 75 | ||
76 | // Add the arguments supplied when running the application to the configuration | ||
57 | ArgvConfigSource configSource = new ArgvConfigSource(args); | 77 | ArgvConfigSource configSource = new ArgvConfigSource(args); |
78 | |||
79 | // Configure Log4Net | ||
58 | configSource.AddSwitch("Startup", "logconfig"); | 80 | configSource.AddSwitch("Startup", "logconfig"); |
59 | string logConfigFile = configSource.Configs["Startup"].GetString("logconfig", String.Empty); | 81 | string logConfigFile = configSource.Configs["Startup"].GetString("logconfig", String.Empty); |
60 | if (logConfigFile != String.Empty) | 82 | if (logConfigFile != String.Empty) |
@@ -69,6 +91,8 @@ namespace OpenSim | |||
69 | m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); | 91 | m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config"); |
70 | } | 92 | } |
71 | 93 | ||
94 | // Check if the system is compatible with OpenSimulator. | ||
95 | // Ensures that the minimum system requirements are met | ||
72 | m_log.Info("Performing compatibility checks... "); | 96 | m_log.Info("Performing compatibility checks... "); |
73 | string supported = String.Empty; | 97 | string supported = String.Empty; |
74 | if (Util.IsEnvironmentSupported(ref supported)) | 98 | if (Util.IsEnvironmentSupported(ref supported)) |
@@ -80,6 +104,7 @@ namespace OpenSim | |||
80 | m_log.Warn("Environment is unsupported (" + supported + ")\n"); | 104 | m_log.Warn("Environment is unsupported (" + supported + ")\n"); |
81 | } | 105 | } |
82 | 106 | ||
107 | // Configure nIni aliases and localles | ||
83 | Culture.SetCurrentCulture(); | 108 | Culture.SetCurrentCulture(); |
84 | 109 | ||
85 | 110 | ||
@@ -99,8 +124,13 @@ namespace OpenSim | |||
99 | configSource.AddConfig("StandAlone"); | 124 | configSource.AddConfig("StandAlone"); |
100 | configSource.AddConfig("Network"); | 125 | configSource.AddConfig("Network"); |
101 | 126 | ||
127 | // Check if we're running in the background or not | ||
102 | bool background = configSource.Configs["Startup"].GetBoolean("background", false); | 128 | bool background = configSource.Configs["Startup"].GetBoolean("background", false); |
129 | |||
130 | // Check if we're saving crashes | ||
103 | m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); | 131 | m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); |
132 | |||
133 | // load Crash directory config | ||
104 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); | 134 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); |
105 | 135 | ||
106 | if (background) | 136 | if (background) |
@@ -118,6 +148,7 @@ namespace OpenSim | |||
118 | { | 148 | { |
119 | try | 149 | try |
120 | { | 150 | { |
151 | // Block thread here for input | ||
121 | MainConsole.Instance.Prompt(); | 152 | MainConsole.Instance.Prompt(); |
122 | } | 153 | } |
123 | catch (Exception e) | 154 | catch (Exception e) |
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 3a65242..c3e7b86 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -37,12 +37,32 @@ using OpenSim.Framework; | |||
37 | 37 | ||
38 | namespace OpenSim | 38 | namespace OpenSim |
39 | { | 39 | { |
40 | /// <summary> | ||
41 | /// Loads the Configuration files into nIni | ||
42 | /// </summary> | ||
40 | public class ConfigurationLoader | 43 | public class ConfigurationLoader |
41 | { | 44 | { |
45 | /// <summary> | ||
46 | /// Various Config settings the region needs to start | ||
47 | /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, | ||
48 | /// StorageDLL, Storage Connection String, Estate connection String, Client Stack | ||
49 | /// Standalone settings. | ||
50 | /// </summary> | ||
42 | protected ConfigSettings m_configSettings; | 51 | protected ConfigSettings m_configSettings; |
52 | |||
53 | /// <summary> | ||
54 | /// A source of Configuration data | ||
55 | /// </summary> | ||
43 | protected OpenSimConfigSource m_config; | 56 | protected OpenSimConfigSource m_config; |
57 | |||
58 | /// <summary> | ||
59 | /// Grid Service Information. This refers to classes and addresses of the grid service | ||
60 | /// </summary> | ||
44 | protected NetworkServersInfo m_networkServersInfo; | 61 | protected NetworkServersInfo m_networkServersInfo; |
45 | 62 | ||
63 | /// <summary> | ||
64 | /// Console logger | ||
65 | /// </summary> | ||
46 | private static readonly ILog m_log = | 66 | private static readonly ILog m_log = |
47 | LogManager.GetLogger( | 67 | LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 68 | MethodBase.GetCurrentMethod().DeclaringType); |
@@ -51,6 +71,13 @@ namespace OpenSim | |||
51 | { | 71 | { |
52 | } | 72 | } |
53 | 73 | ||
74 | /// <summary> | ||
75 | /// Loads the region configuration | ||
76 | /// </summary> | ||
77 | /// <param name="argvSource">Parameters passed into the process when started</param> | ||
78 | /// <param name="configSettings"></param> | ||
79 | /// <param name="networkInfo"></param> | ||
80 | /// <returns>A configuration that gets passed to modules</returns> | ||
54 | public OpenSimConfigSource LoadConfigSettings( | 81 | public OpenSimConfigSource LoadConfigSettings( |
55 | IConfigSource argvSource, out ConfigSettings configSettings, | 82 | IConfigSource argvSource, out ConfigSettings configSettings, |
56 | out NetworkServersInfo networkInfo) | 83 | out NetworkServersInfo networkInfo) |
@@ -169,15 +196,22 @@ namespace OpenSim | |||
169 | return m_config; | 196 | return m_config; |
170 | } | 197 | } |
171 | 198 | ||
199 | /// <summary> | ||
200 | /// Adds the included files as ini configuration files | ||
201 | /// </summary> | ||
202 | /// <param name="sources">List of URL strings or filename strings</param> | ||
172 | private void AddIncludes(List<string> sources) | 203 | private void AddIncludes(List<string> sources) |
173 | { | 204 | { |
205 | //loop over config sources | ||
174 | foreach (IConfig config in m_config.Source.Configs) | 206 | foreach (IConfig config in m_config.Source.Configs) |
175 | { | 207 | { |
208 | // Look for Include-* in the key name | ||
176 | string[] keys = config.GetKeys(); | 209 | string[] keys = config.GetKeys(); |
177 | foreach (string k in keys) | 210 | foreach (string k in keys) |
178 | { | 211 | { |
179 | if (k.StartsWith("Include-")) | 212 | if (k.StartsWith("Include-")) |
180 | { | 213 | { |
214 | // read the config file to be included. | ||
181 | string file = config.GetString(k); | 215 | string file = config.GetString(k); |
182 | if (IsUri(file)) | 216 | if (IsUri(file)) |
183 | { | 217 | { |
@@ -199,7 +233,11 @@ namespace OpenSim | |||
199 | } | 233 | } |
200 | } | 234 | } |
201 | } | 235 | } |
202 | 236 | /// <summary> | |
237 | /// Check if we can convert the string to a URI | ||
238 | /// </summary> | ||
239 | /// <param name="file">String uri to the remote resource</param> | ||
240 | /// <returns>true if we can convert the string to a Uri object</returns> | ||
203 | bool IsUri(string file) | 241 | bool IsUri(string file) |
204 | { | 242 | { |
205 | Uri configUri; | 243 | Uri configUri; |
@@ -253,7 +291,7 @@ namespace OpenSim | |||
253 | /// <summary> | 291 | /// <summary> |
254 | /// Setup a default config values in case they aren't present in the ini file | 292 | /// Setup a default config values in case they aren't present in the ini file |
255 | /// </summary> | 293 | /// </summary> |
256 | /// <returns></returns> | 294 | /// <returns>A Configuration source containing the default configuration</returns> |
257 | private static IConfigSource DefaultConfig() | 295 | private static IConfigSource DefaultConfig() |
258 | { | 296 | { |
259 | IConfigSource defaultConfig = new IniConfigSource(); | 297 | IConfigSource defaultConfig = new IniConfigSource(); |
@@ -322,6 +360,9 @@ namespace OpenSim | |||
322 | return defaultConfig; | 360 | return defaultConfig; |
323 | } | 361 | } |
324 | 362 | ||
363 | /// <summary> | ||
364 | /// Read initial region settings from the ConfigSource | ||
365 | /// </summary> | ||
325 | protected virtual void ReadConfigSettings() | 366 | protected virtual void ReadConfigSettings() |
326 | { | 367 | { |
327 | IConfig startupConfig = m_config.Source.Configs["Startup"]; | 368 | IConfig startupConfig = m_config.Source.Configs["Startup"]; |
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs index 1e1dae0..6e6d48c 100644 --- a/OpenSim/Region/Application/IApplicationPlugin.cs +++ b/OpenSim/Region/Application/IApplicationPlugin.cs | |||
@@ -29,12 +29,24 @@ using OpenSim.Framework; | |||
29 | 29 | ||
30 | namespace OpenSim | 30 | namespace OpenSim |
31 | { | 31 | { |
32 | /// <summary> | ||
33 | /// OpenSimulator Application Plugin framework interface | ||
34 | /// </summary> | ||
32 | public interface IApplicationPlugin : IPlugin | 35 | public interface IApplicationPlugin : IPlugin |
33 | { | 36 | { |
37 | /// <summary> | ||
38 | /// Initialize the Plugin | ||
39 | /// </summary> | ||
40 | /// <param name="openSim">The Application instance</param> | ||
34 | void Initialise(OpenSimBase openSim); | 41 | void Initialise(OpenSimBase openSim); |
42 | |||
43 | /// <summary> | ||
44 | /// Called when the application loading is completed | ||
45 | /// </summary> | ||
35 | void PostInitialise(); | 46 | void PostInitialise(); |
36 | } | 47 | } |
37 | 48 | ||
49 | |||
38 | public class ApplicationPluginInitialiser : PluginInitialiserBase | 50 | public class ApplicationPluginInitialiser : PluginInitialiserBase |
39 | { | 51 | { |
40 | private OpenSimBase server; | 52 | private OpenSimBase server; |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index aeb6f57..390cfcd 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -146,6 +146,9 @@ namespace OpenSim | |||
146 | ChangeSelectedRegion("region", new string[] {"change", "region", "root"}); | 146 | ChangeSelectedRegion("region", new string[] {"change", "region", "root"}); |
147 | } | 147 | } |
148 | 148 | ||
149 | /// <summary> | ||
150 | /// Register standard set of region console commands | ||
151 | /// </summary> | ||
149 | private void RegisterConsoleCommands() | 152 | private void RegisterConsoleCommands() |
150 | { | 153 | { |
151 | m_console.Commands.AddCommand("region", false, "clear assets", | 154 | m_console.Commands.AddCommand("region", false, "clear assets", |
@@ -332,6 +335,11 @@ namespace OpenSim | |||
332 | base.ShutdownSpecific(); | 335 | base.ShutdownSpecific(); |
333 | } | 336 | } |
334 | 337 | ||
338 | /// <summary> | ||
339 | /// Timer to run a specific text file as console commands. Configured in in the main ini file | ||
340 | /// </summary> | ||
341 | /// <param name="sender"></param> | ||
342 | /// <param name="e"></param> | ||
335 | private void RunAutoTimerScript(object sender, EventArgs e) | 343 | private void RunAutoTimerScript(object sender, EventArgs e) |
336 | { | 344 | { |
337 | if (m_timedScript != "disabled") | 345 | if (m_timedScript != "disabled") |
@@ -342,6 +350,11 @@ namespace OpenSim | |||
342 | 350 | ||
343 | #region Console Commands | 351 | #region Console Commands |
344 | 352 | ||
353 | /// <summary> | ||
354 | /// Kicks users off the region | ||
355 | /// </summary> | ||
356 | /// <param name="module"></param> | ||
357 | /// <param name="cmdparams">name of avatar to kick</param> | ||
345 | private void KickUserCommand(string module, string[] cmdparams) | 358 | private void KickUserCommand(string module, string[] cmdparams) |
346 | { | 359 | { |
347 | if (cmdparams.Length < 4) | 360 | if (cmdparams.Length < 4) |
@@ -401,6 +414,10 @@ namespace OpenSim | |||
401 | } | 414 | } |
402 | } | 415 | } |
403 | 416 | ||
417 | /// <summary> | ||
418 | /// Opens a file and uses it as input to the console command parser. | ||
419 | /// </summary> | ||
420 | /// <param name="fileName">name of file to use as input to the console</param> | ||
404 | private static void PrintFileToConsole(string fileName) | 421 | private static void PrintFileToConsole(string fileName) |
405 | { | 422 | { |
406 | if (File.Exists(fileName)) | 423 | if (File.Exists(fileName)) |
@@ -419,12 +436,22 @@ namespace OpenSim | |||
419 | m_log.Info("Not implemented."); | 436 | m_log.Info("Not implemented."); |
420 | } | 437 | } |
421 | 438 | ||
439 | /// <summary> | ||
440 | /// Force resending of all updates to all clients in active region(s) | ||
441 | /// </summary> | ||
442 | /// <param name="module"></param> | ||
443 | /// <param name="args"></param> | ||
422 | private void HandleForceUpdate(string module, string[] args) | 444 | private void HandleForceUpdate(string module, string[] args) |
423 | { | 445 | { |
424 | m_log.Info("Updating all clients"); | 446 | m_log.Info("Updating all clients"); |
425 | m_sceneManager.ForceCurrentSceneClientUpdate(); | 447 | m_sceneManager.ForceCurrentSceneClientUpdate(); |
426 | } | 448 | } |
427 | 449 | ||
450 | /// <summary> | ||
451 | /// Edits the scale of a primative with the name specified | ||
452 | /// </summary> | ||
453 | /// <param name="module"></param> | ||
454 | /// <param name="args">0,1, name, x, y, z</param> | ||
428 | private void HandleEditScale(string module, string[] args) | 455 | private void HandleEditScale(string module, string[] args) |
429 | { | 456 | { |
430 | if (args.Length == 6) | 457 | if (args.Length == 6) |
@@ -437,6 +464,11 @@ namespace OpenSim | |||
437 | } | 464 | } |
438 | } | 465 | } |
439 | 466 | ||
467 | /// <summary> | ||
468 | /// Creates a new region based on the parameters specified. This will ask the user questions on the console | ||
469 | /// </summary> | ||
470 | /// <param name="module"></param> | ||
471 | /// <param name="cmd">0,1,region name, region XML file</param> | ||
440 | private void HandleCreateRegion(string module, string[] cmd) | 472 | private void HandleCreateRegion(string module, string[] cmd) |
441 | { | 473 | { |
442 | if (cmd.Length < 4) | 474 | if (cmd.Length < 4) |
@@ -473,16 +505,32 @@ namespace OpenSim | |||
473 | } | 505 | } |
474 | } | 506 | } |
475 | 507 | ||
508 | /// <summary> | ||
509 | /// Enable logins | ||
510 | /// </summary> | ||
511 | /// <param name="module"></param> | ||
512 | /// <param name="cmd"></param> | ||
476 | private void HandleLoginEnable(string module, string[] cmd) | 513 | private void HandleLoginEnable(string module, string[] cmd) |
477 | { | 514 | { |
478 | ProcessLogin(true); | 515 | ProcessLogin(true); |
479 | } | 516 | } |
480 | 517 | ||
518 | |||
519 | /// <summary> | ||
520 | /// Disable logins | ||
521 | /// </summary> | ||
522 | /// <param name="module"></param> | ||
523 | /// <param name="cmd"></param> | ||
481 | private void HandleLoginDisable(string module, string[] cmd) | 524 | private void HandleLoginDisable(string module, string[] cmd) |
482 | { | 525 | { |
483 | ProcessLogin(false); | 526 | ProcessLogin(false); |
484 | } | 527 | } |
485 | 528 | ||
529 | /// <summary> | ||
530 | /// Log login status to the console | ||
531 | /// </summary> | ||
532 | /// <param name="module"></param> | ||
533 | /// <param name="cmd"></param> | ||
486 | private void HandleLoginStatus(string module, string[] cmd) | 534 | private void HandleLoginStatus(string module, string[] cmd) |
487 | { | 535 | { |
488 | if (m_commsManager.GridService.RegionLoginsEnabled == false) | 536 | if (m_commsManager.GridService.RegionLoginsEnabled == false) |
@@ -492,6 +540,12 @@ namespace OpenSim | |||
492 | m_log.Info("[ Login ] Login are enabled"); | 540 | m_log.Info("[ Login ] Login are enabled"); |
493 | } | 541 | } |
494 | 542 | ||
543 | |||
544 | /// <summary> | ||
545 | /// Change and load configuration file data. | ||
546 | /// </summary> | ||
547 | /// <param name="module"></param> | ||
548 | /// <param name="cmd"></param> | ||
495 | private void HandleConfig(string module, string[] cmd) | 549 | private void HandleConfig(string module, string[] cmd) |
496 | { | 550 | { |
497 | List<string> args = new List<string>(cmd); | 551 | List<string> args = new List<string>(cmd); |
@@ -557,6 +611,12 @@ namespace OpenSim | |||
557 | } | 611 | } |
558 | } | 612 | } |
559 | 613 | ||
614 | |||
615 | /// <summary> | ||
616 | /// Load, Unload, and list Region modules in use | ||
617 | /// </summary> | ||
618 | /// <param name="module"></param> | ||
619 | /// <param name="cmd"></param> | ||
560 | private void HandleModules(string module, string[] cmd) | 620 | private void HandleModules(string module, string[] cmd) |
561 | { | 621 | { |
562 | List<string> args = new List<string>(cmd); | 622 | List<string> args = new List<string>(cmd); |
@@ -797,6 +857,11 @@ namespace OpenSim | |||
797 | } | 857 | } |
798 | 858 | ||
799 | // see BaseOpenSimServer | 859 | // see BaseOpenSimServer |
860 | /// <summary> | ||
861 | /// Many commands list objects for debugging. Some of the types are listed here | ||
862 | /// </summary> | ||
863 | /// <param name="mod"></param> | ||
864 | /// <param name="cmd"></param> | ||
800 | public override void HandleShow(string mod, string[] cmd) | 865 | public override void HandleShow(string mod, string[] cmd) |
801 | { | 866 | { |
802 | base.HandleShow(mod, cmd); | 867 | base.HandleShow(mod, cmd); |
@@ -902,6 +967,10 @@ namespace OpenSim | |||
902 | } | 967 | } |
903 | } | 968 | } |
904 | 969 | ||
970 | /// <summary> | ||
971 | /// print UDP Queue data for each client | ||
972 | /// </summary> | ||
973 | /// <returns></returns> | ||
905 | private string GetQueuesReport() | 974 | private string GetQueuesReport() |
906 | { | 975 | { |
907 | string report = String.Empty; | 976 | string report = String.Empty; |
@@ -1010,6 +1079,11 @@ namespace OpenSim | |||
1010 | m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword); | 1079 | m_commsManager.UserAdminService.ResetUserPassword(firstName, lastName, newPassword); |
1011 | } | 1080 | } |
1012 | 1081 | ||
1082 | /// <summary> | ||
1083 | /// Use XML2 format to serialize data to a file | ||
1084 | /// </summary> | ||
1085 | /// <param name="module"></param> | ||
1086 | /// <param name="cmdparams"></param> | ||
1013 | protected void SavePrimsXml2(string module, string[] cmdparams) | 1087 | protected void SavePrimsXml2(string module, string[] cmdparams) |
1014 | { | 1088 | { |
1015 | if (cmdparams.Length > 5) | 1089 | if (cmdparams.Length > 5) |
@@ -1022,6 +1096,11 @@ namespace OpenSim | |||
1022 | } | 1096 | } |
1023 | } | 1097 | } |
1024 | 1098 | ||
1099 | /// <summary> | ||
1100 | /// Use XML format to serialize data to a file | ||
1101 | /// </summary> | ||
1102 | /// <param name="module"></param> | ||
1103 | /// <param name="cmdparams"></param> | ||
1025 | protected void SaveXml(string module, string[] cmdparams) | 1104 | protected void SaveXml(string module, string[] cmdparams) |
1026 | { | 1105 | { |
1027 | m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); | 1106 | m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason."); |
@@ -1036,6 +1115,11 @@ namespace OpenSim | |||
1036 | } | 1115 | } |
1037 | } | 1116 | } |
1038 | 1117 | ||
1118 | /// <summary> | ||
1119 | /// Loads data and region objects from XML format. | ||
1120 | /// </summary> | ||
1121 | /// <param name="module"></param> | ||
1122 | /// <param name="cmdparams"></param> | ||
1039 | protected void LoadXml(string module, string[] cmdparams) | 1123 | protected void LoadXml(string module, string[] cmdparams) |
1040 | { | 1124 | { |
1041 | m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); | 1125 | m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); |
@@ -1079,7 +1163,11 @@ namespace OpenSim | |||
1079 | } | 1163 | } |
1080 | } | 1164 | } |
1081 | } | 1165 | } |
1082 | 1166 | /// <summary> | |
1167 | /// Serialize region data to XML2Format | ||
1168 | /// </summary> | ||
1169 | /// <param name="module"></param> | ||
1170 | /// <param name="cmdparams"></param> | ||
1083 | protected void SaveXml2(string module, string[] cmdparams) | 1171 | protected void SaveXml2(string module, string[] cmdparams) |
1084 | { | 1172 | { |
1085 | if (cmdparams.Length > 2) | 1173 | if (cmdparams.Length > 2) |
@@ -1092,6 +1180,11 @@ namespace OpenSim | |||
1092 | } | 1180 | } |
1093 | } | 1181 | } |
1094 | 1182 | ||
1183 | /// <summary> | ||
1184 | /// Load region data from Xml2Format | ||
1185 | /// </summary> | ||
1186 | /// <param name="module"></param> | ||
1187 | /// <param name="cmdparams"></param> | ||
1095 | protected void LoadXml2(string module, string[] cmdparams) | 1188 | protected void LoadXml2(string module, string[] cmdparams) |
1096 | { | 1189 | { |
1097 | if (cmdparams.Length > 2) | 1190 | if (cmdparams.Length > 2) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs index f2b736c..375faf5 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | 30 | ||
4 | using OpenMetaverse; | 31 | using OpenMetaverse; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs index 49c0083..c8f04a5 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Reflection; | 30 | using System.Reflection; |
4 | 31 | ||
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/TestInventoryService.cs index 0c19164..6635700 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryService.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryService.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |