From 2a2ef42e64e202c81762adf0cc0e4cb1393f71ef Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 24 Apr 2008 12:27:24 +0000 Subject: replace hard tabs with 4 spaces to be consistant in the source. Please adjust your editors to not use hard tabs. --- OpenSim/Framework/AssetLandmark.cs | 2 +- OpenSim/Framework/BlockingQueue.cs | 6 +- OpenSim/Framework/IClientAPI.cs | 20 ++-- OpenSim/Framework/InventoryFolderBase.cs | 72 +++++++------- OpenSim/Framework/InventoryItemBase.cs | 156 +++++++++++++++---------------- OpenSim/Framework/OSUUID.cs | 2 +- OpenSim/Framework/TaskInventoryItem.cs | 16 ++-- OpenSim/Framework/Util.cs | 8 +- 8 files changed, 141 insertions(+), 141 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs index 974a632..f322636 100644 --- a/OpenSim/Framework/AssetLandmark.cs +++ b/OpenSim/Framework/AssetLandmark.cs @@ -35,7 +35,7 @@ namespace OpenSim.Framework public int Version; public LLVector3 Position; public LLUUID RegionID; - public ulong RegionHandle; + public ulong RegionHandle; public AssetLandmark(AssetBase a) { diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index 31e756e..dbb3d84 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs @@ -68,9 +68,9 @@ namespace OpenSim.Framework public int Count() { lock(m_queueSync) - { - return m_queue.Count; - } + { + return m_queue.Count; + } } public T[] GetQueueArray() diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 28047e7..388dfd7 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -440,9 +440,9 @@ namespace OpenSim.Framework public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); - public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer); - public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID); - + public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer); + public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID); + public interface IClientAPI { event ImprovedInstantMessage OnInstantMessage; @@ -559,13 +559,13 @@ namespace OpenSim.Framework event MoneyBalanceRequest OnMoneyBalanceRequest; event UpdateAvatarProperties OnUpdateAvatarProperties; event ParcelBuy OnParcelBuy; - event RequestPayPrice OnRequestPayPrice ; + event RequestPayPrice OnRequestPayPrice ; event ObjectIncludeInSearch OnObjectIncludeInSearch; event UUIDNameRequest OnTeleportHomeRequest; - - event ScriptAnswer OnScriptAnswer; + + event ScriptAnswer OnScriptAnswer; LLVector3 StartPos { get; set; } @@ -578,8 +578,8 @@ namespace OpenSim.Framework string FirstName { get; } string LastName { get; } - - int NextAnimationSequenceNumber { get; } + + int NextAnimationSequenceNumber { get; } /// /// Returns the full name of the agent/avatar represented by this client @@ -624,7 +624,7 @@ namespace OpenSim.Framework void SendTeleportFailed(string reason); void SendTeleportLocationStart(); void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); - void SendPayPrice(LLUUID objectID, int[] payPrice); + void SendPayPrice(LLUUID objectID, int[] payPrice); void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID); @@ -703,7 +703,7 @@ namespace OpenSim.Framework void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); - void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); + void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); byte[] GetThrottlesPacked(float multiplier); diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs index 8e276e9..d3af3c7 100644 --- a/OpenSim/Framework/InventoryFolderBase.cs +++ b/OpenSim/Framework/InventoryFolderBase.cs @@ -67,57 +67,57 @@ namespace OpenSim.Framework private ushort _version; public string Name { - get { - return _name; - } - set { - _name = value; - } + get { + return _name; + } + set { + _name = value; + } } public LLUUID Owner { - get { - return _owner; - } - set { - _owner = value; - } + get { + return _owner; + } + set { + _owner = value; + } } public LLUUID ParentID { - get { - return _parentID; - } - set { - _parentID = value; - } + get { + return _parentID; + } + set { + _parentID = value; + } } public LLUUID ID { - get { - return _id; - } - set { - _id = value; - } + get { + return _id; + } + set { + _id = value; + } } public short Type { - get { - return _type; - } - set { - _type = value; - } + get { + return _type; + } + set { + _type = value; + } } public ushort Version { - get { - return _version; - } - set { - _version = value; - } + get { + return _version; + } + set { + _version = value; + } } } } diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index 6ed2961..ccb8163 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs @@ -100,120 +100,120 @@ namespace OpenSim.Framework private uint _everyOnePermissions; public LLUUID ID { - get { - return _id; - } - set { - _id = value; - } + get { + return _id; + } + set { + _id = value; + } } public int InvType { - get { - return _invType; - } - set { - _invType = value; - } + get { + return _invType; + } + set { + _invType = value; + } } public LLUUID Folder { - get { - return _folder; - } - set { - _folder = value; - } + get { + return _folder; + } + set { + _folder = value; + } } public LLUUID Owner { - get { - return _owner; - } - set { - _owner = value; - } + get { + return _owner; + } + set { + _owner = value; + } } public LLUUID Creator { - get { - return _creator; - } - set { - _creator = value; - } + get { + return _creator; + } + set { + _creator = value; + } } public string Name { - get { - return _name; - } - set { - _name = value; - } + get { + return _name; + } + set { + _name = value; + } } public string Description { - get { - return _description; - } - set { - _description = value; - } + get { + return _description; + } + set { + _description = value; + } } public uint NextPermissions { - get { - return _nextPermissions; - } - set { - _nextPermissions = value; - } + get { + return _nextPermissions; + } + set { + _nextPermissions = value; + } } public uint CurrentPermissions { - get { - return _currentPermissions; - } - set { - _currentPermissions = value; - } + get { + return _currentPermissions; + } + set { + _currentPermissions = value; + } } public uint BasePermissions { - get { - return _basePermissions; - } - set { - _basePermissions = value; - } + get { + return _basePermissions; + } + set { + _basePermissions = value; + } } public uint EveryOnePermissions { - get { - return _everyOnePermissions; - } - set { - _everyOnePermissions = value; - } + get { + return _everyOnePermissions; + } + set { + _everyOnePermissions = value; + } } public int AssetType { - get { - return _assetType; - } - set { - _assetType = value; - } + get { + return _assetType; + } + set { + _assetType = value; + } } public LLUUID AssetID { - get { - return _assetID; - } - set { - _assetID = value; - } + get { + return _assetID; + } + set { + _assetID = value; + } } } } diff --git a/OpenSim/Framework/OSUUID.cs b/OpenSim/Framework/OSUUID.cs index 169c0e3..90de347 100644 --- a/OpenSim/Framework/OSUUID.cs +++ b/OpenSim/Framework/OSUUID.cs @@ -34,7 +34,7 @@ namespace OpenSim.Framework public class OSUUID: IComparable { public Guid UUID; - + public OSUUID() {} /* Constructors */ diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 1eff696..615644b 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs @@ -154,14 +154,14 @@ namespace OpenSim.Framework "lsl_text", String.Empty, String.Empty, - "bodypart", + "bodypart", String.Empty, "snapshot", String.Empty, String.Empty, "wearable", - "animation", - "gesture" + "animation", + "gesture" }; @@ -183,15 +183,15 @@ namespace OpenSim.Framework "lsltext", "lslbyte", "txtr_tga", - "bodypart", + "bodypart", "trash", "snapshot", "lstndfnd", "snd_wav", "img_tga", "jpeg", - "animatn", - "gesture" + "animatn", + "gesture" }; public LLUUID ItemID = LLUUID.Zero; @@ -214,8 +214,8 @@ namespace OpenSim.Framework public string Name = String.Empty; public string Description = String.Empty; public uint CreationDate = 0; - public LLUUID PermsGranter; - public int PermsMask; + public LLUUID PermsGranter; + public int PermsMask; public LLUUID ParentPartID = LLUUID.Zero; diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 2396519..8114957 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -622,15 +622,15 @@ namespace OpenSim.Framework } return returnstring; } - - static public XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args) + + static public XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args) { return SendXmlRpcCommand(url, methodName, args); } - + static public XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args) { - XmlRpcRequest client = new XmlRpcRequest(methodName, args); + XmlRpcRequest client = new XmlRpcRequest(methodName, args); return client.Send(url, 6000); } -- cgit v1.1