diff options
author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Framework | |
parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
download | opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/FileAssetClient.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs index e793feb..17282a1 100644 --- a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs | |||
@@ -6,11 +6,11 @@ namespace OpenSim.Framework.Communications.Cache | |||
6 | public class FileAssetClient : AssetServerBase | 6 | public class FileAssetClient : AssetServerBase |
7 | { | 7 | { |
8 | private readonly string m_dir; | 8 | private readonly string m_dir; |
9 | private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase)); | 9 | private readonly XmlSerializer m_xs = new XmlSerializer(typeof(AssetBase)); |
10 | 10 | ||
11 | public FileAssetClient(string dir) | 11 | public FileAssetClient(string dir) |
12 | { | 12 | { |
13 | if(!Directory.Exists(dir)) | 13 | if (!Directory.Exists(dir)) |
14 | { | 14 | { |
15 | Directory.CreateDirectory(dir); | 15 | Directory.CreateDirectory(dir); |
16 | } | 16 | } |
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 42292f3..7cdbf6c 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Framework.Communications | |||
74 | } | 74 | } |
75 | 75 | ||
76 | /// <summary> | 76 | /// <summary> |
77 | /// Customises the login response and fills in missing values. This method also tells the login region to | 77 | /// Customises the login response and fills in missing values. This method also tells the login region to |
78 | /// expect a client connection. | 78 | /// expect a client connection. |
79 | /// </summary> | 79 | /// </summary> |
80 | /// <param name="response">The existing response</param> | 80 | /// <param name="response">The existing response</param> |
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Communications | |||
89 | public virtual void LogOffUser(UserProfileData theUser, string message) | 89 | public virtual void LogOffUser(UserProfileData theUser, string message) |
90 | { | 90 | { |
91 | } | 91 | } |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Get the initial login inventory skeleton (in other words, the folder structure) for the given user. | 94 | /// Get the initial login inventory skeleton (in other words, the folder structure) for the given user. |
95 | /// </summary> | 95 | /// </summary> |
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Communications | |||
298 | m_log.DebugFormat( | 298 | m_log.DebugFormat( |
299 | "[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.", | 299 | "[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.", |
300 | firstname, lastname); | 300 | firstname, lastname); |
301 | 301 | ||
302 | return logResponse.ToXmlRpcResponse(); | 302 | return logResponse.ToXmlRpcResponse(); |
303 | } | 303 | } |
304 | else | 304 | else |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index a7baf0e..e1c6f4b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -325,7 +325,7 @@ namespace OpenSim.Framework | |||
325 | 325 | ||
326 | ulong ActiveGroupPowers { get; } | 326 | ulong ActiveGroupPowers { get; } |
327 | 327 | ||
328 | ulong GetGroupPowers(UUID groupID); | 328 | ulong GetGroupPowers(UUID groupID); |
329 | 329 | ||
330 | string FirstName { get; } | 330 | string FirstName { get; } |
331 | 331 | ||
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 427832d..d289978 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -737,11 +737,11 @@ namespace OpenSim.Framework | |||
737 | /// The extracted ulong | 737 | /// The extracted ulong |
738 | /// </returns> | 738 | /// </returns> |
739 | public static ulong BytesToUInt64Big(byte[] bytes) { | 739 | public static ulong BytesToUInt64Big(byte[] bytes) { |
740 | if(bytes.Length < 8) return 0; | 740 | if (bytes.Length < 8) return 0; |
741 | return ((ulong)bytes[0] << 56) | ((ulong)bytes[1] << 48) | ((ulong)bytes[2] << 40) | ((ulong)bytes[3] << 32) | | 741 | return ((ulong)bytes[0] << 56) | ((ulong)bytes[1] << 48) | ((ulong)bytes[2] << 40) | ((ulong)bytes[3] << 32) | |
742 | ((ulong)bytes[4] << 24) | ((ulong)bytes[5] << 16) | ((ulong)bytes[6] << 8) | (ulong)bytes[7]; | 742 | ((ulong)bytes[4] << 24) | ((ulong)bytes[5] << 16) | ((ulong)bytes[6] << 8) | (ulong)bytes[7]; |
743 | } | 743 | } |
744 | 744 | ||
745 | // used for RemoteParcelRequest (for "About Landmark") | 745 | // used for RemoteParcelRequest (for "About Landmark") |
746 | public static UUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) { | 746 | public static UUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) { |
747 | byte[] bytes = { | 747 | byte[] bytes = { |