aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2008-04-24 12:27:24 +0000
committerSean Dague2008-04-24 12:27:24 +0000
commit2a2ef42e64e202c81762adf0cc0e4cb1393f71ef (patch)
tree20768ffd9610712a51a4cc7f9f0ffbe667fbe2e2 /OpenSim/Framework
parent* Adds much better support for attachments that you right click on in world. (diff)
downloadopensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.zip
opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.gz
opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.bz2
opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.xz
replace hard tabs with 4 spaces to be consistant in the source.
Please adjust your editors to not use hard tabs.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AssetLandmark.cs2
-rw-r--r--OpenSim/Framework/BlockingQueue.cs6
-rw-r--r--OpenSim/Framework/IClientAPI.cs20
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs72
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs156
-rw-r--r--OpenSim/Framework/OSUUID.cs2
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs16
-rw-r--r--OpenSim/Framework/Util.cs8
8 files changed, 141 insertions, 141 deletions
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
35 public int Version; 35 public int Version;
36 public LLVector3 Position; 36 public LLVector3 Position;
37 public LLUUID RegionID; 37 public LLUUID RegionID;
38 public ulong RegionHandle; 38 public ulong RegionHandle;
39 39
40 public AssetLandmark(AssetBase a) 40 public AssetLandmark(AssetBase a)
41 { 41 {
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
68 public int Count() 68 public int Count()
69 { 69 {
70 lock(m_queueSync) 70 lock(m_queueSync)
71 { 71 {
72 return m_queue.Count; 72 return m_queue.Count;
73 } 73 }
74 } 74 }
75 75
76 public T[] GetQueueArray() 76 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
440 440
441 public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); 441 public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);
442 442
443 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer); 443 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer);
444 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID); 444 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID);
445 445
446 public interface IClientAPI 446 public interface IClientAPI
447 { 447 {
448 event ImprovedInstantMessage OnInstantMessage; 448 event ImprovedInstantMessage OnInstantMessage;
@@ -559,13 +559,13 @@ namespace OpenSim.Framework
559 event MoneyBalanceRequest OnMoneyBalanceRequest; 559 event MoneyBalanceRequest OnMoneyBalanceRequest;
560 event UpdateAvatarProperties OnUpdateAvatarProperties; 560 event UpdateAvatarProperties OnUpdateAvatarProperties;
561 event ParcelBuy OnParcelBuy; 561 event ParcelBuy OnParcelBuy;
562 event RequestPayPrice OnRequestPayPrice ; 562 event RequestPayPrice OnRequestPayPrice ;
563 563
564 event ObjectIncludeInSearch OnObjectIncludeInSearch; 564 event ObjectIncludeInSearch OnObjectIncludeInSearch;
565 565
566 event UUIDNameRequest OnTeleportHomeRequest; 566 event UUIDNameRequest OnTeleportHomeRequest;
567 567
568 event ScriptAnswer OnScriptAnswer; 568 event ScriptAnswer OnScriptAnswer;
569 569
570 LLVector3 StartPos { get; set; } 570 LLVector3 StartPos { get; set; }
571 571
@@ -578,8 +578,8 @@ namespace OpenSim.Framework
578 string FirstName { get; } 578 string FirstName { get; }
579 579
580 string LastName { get; } 580 string LastName { get; }
581 581
582 int NextAnimationSequenceNumber { get; } 582 int NextAnimationSequenceNumber { get; }
583 583
584 /// <summary> 584 /// <summary>
585 /// Returns the full name of the agent/avatar represented by this client 585 /// Returns the full name of the agent/avatar represented by this client
@@ -624,7 +624,7 @@ namespace OpenSim.Framework
624 void SendTeleportFailed(string reason); 624 void SendTeleportFailed(string reason);
625 void SendTeleportLocationStart(); 625 void SendTeleportLocationStart();
626 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); 626 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
627 void SendPayPrice(LLUUID objectID, int[] payPrice); 627 void SendPayPrice(LLUUID objectID, int[] payPrice);
628 628
629 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, 629 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID,
630 LLVector3 Pos, byte[] textureEntry, uint parentID); 630 LLVector3 Pos, byte[] textureEntry, uint parentID);
@@ -703,7 +703,7 @@ namespace OpenSim.Framework
703 703
704 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, 704 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout,
705 uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); 705 uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID);
706 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); 706 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question);
707 707
708 byte[] GetThrottlesPacked(float multiplier); 708 byte[] GetThrottlesPacked(float multiplier);
709 709
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
67 private ushort _version; 67 private ushort _version;
68 68
69 public string Name { 69 public string Name {
70 get { 70 get {
71 return _name; 71 return _name;
72 } 72 }
73 set { 73 set {
74 _name = value; 74 _name = value;
75 } 75 }
76 } 76 }
77 77
78 public LLUUID Owner { 78 public LLUUID Owner {
79 get { 79 get {
80 return _owner; 80 return _owner;
81 } 81 }
82 set { 82 set {
83 _owner = value; 83 _owner = value;
84 } 84 }
85 } 85 }
86 86
87 public LLUUID ParentID { 87 public LLUUID ParentID {
88 get { 88 get {
89 return _parentID; 89 return _parentID;
90 } 90 }
91 set { 91 set {
92 _parentID = value; 92 _parentID = value;
93 } 93 }
94 } 94 }
95 95
96 public LLUUID ID { 96 public LLUUID ID {
97 get { 97 get {
98 return _id; 98 return _id;
99 } 99 }
100 set { 100 set {
101 _id = value; 101 _id = value;
102 } 102 }
103 } 103 }
104 104
105 public short Type { 105 public short Type {
106 get { 106 get {
107 return _type; 107 return _type;
108 } 108 }
109 set { 109 set {
110 _type = value; 110 _type = value;
111 } 111 }
112 } 112 }
113 113
114 public ushort Version { 114 public ushort Version {
115 get { 115 get {
116 return _version; 116 return _version;
117 } 117 }
118 set { 118 set {
119 _version = value; 119 _version = value;
120 } 120 }
121 } 121 }
122 } 122 }
123} 123}
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
100 private uint _everyOnePermissions; 100 private uint _everyOnePermissions;
101 101
102 public LLUUID ID { 102 public LLUUID ID {
103 get { 103 get {
104 return _id; 104 return _id;
105 } 105 }
106 set { 106 set {
107 _id = value; 107 _id = value;
108 } 108 }
109 } 109 }
110 110
111 public int InvType { 111 public int InvType {
112 get { 112 get {
113 return _invType; 113 return _invType;
114 } 114 }
115 set { 115 set {
116 _invType = value; 116 _invType = value;
117 } 117 }
118 } 118 }
119 119
120 public LLUUID Folder { 120 public LLUUID Folder {
121 get { 121 get {
122 return _folder; 122 return _folder;
123 } 123 }
124 set { 124 set {
125 _folder = value; 125 _folder = value;
126 } 126 }
127 } 127 }
128 128
129 public LLUUID Owner { 129 public LLUUID Owner {
130 get { 130 get {
131 return _owner; 131 return _owner;
132 } 132 }
133 set { 133 set {
134 _owner = value; 134 _owner = value;
135 } 135 }
136 } 136 }
137 137
138 public LLUUID Creator { 138 public LLUUID Creator {
139 get { 139 get {
140 return _creator; 140 return _creator;
141 } 141 }
142 set { 142 set {
143 _creator = value; 143 _creator = value;
144 } 144 }
145 } 145 }
146 146
147 public string Name { 147 public string Name {
148 get { 148 get {
149 return _name; 149 return _name;
150 } 150 }
151 set { 151 set {
152 _name = value; 152 _name = value;
153 } 153 }
154 } 154 }
155 155
156 public string Description { 156 public string Description {
157 get { 157 get {
158 return _description; 158 return _description;
159 } 159 }
160 set { 160 set {
161 _description = value; 161 _description = value;
162 } 162 }
163 } 163 }
164 164
165 public uint NextPermissions { 165 public uint NextPermissions {
166 get { 166 get {
167 return _nextPermissions; 167 return _nextPermissions;
168 } 168 }
169 set { 169 set {
170 _nextPermissions = value; 170 _nextPermissions = value;
171 } 171 }
172 } 172 }
173 173
174 public uint CurrentPermissions { 174 public uint CurrentPermissions {
175 get { 175 get {
176 return _currentPermissions; 176 return _currentPermissions;
177 } 177 }
178 set { 178 set {
179 _currentPermissions = value; 179 _currentPermissions = value;
180 } 180 }
181 } 181 }
182 182
183 public uint BasePermissions { 183 public uint BasePermissions {
184 get { 184 get {
185 return _basePermissions; 185 return _basePermissions;
186 } 186 }
187 set { 187 set {
188 _basePermissions = value; 188 _basePermissions = value;
189 } 189 }
190 } 190 }
191 191
192 public uint EveryOnePermissions { 192 public uint EveryOnePermissions {
193 get { 193 get {
194 return _everyOnePermissions; 194 return _everyOnePermissions;
195 } 195 }
196 set { 196 set {
197 _everyOnePermissions = value; 197 _everyOnePermissions = value;
198 } 198 }
199 } 199 }
200 200
201 public int AssetType { 201 public int AssetType {
202 get { 202 get {
203 return _assetType; 203 return _assetType;
204 } 204 }
205 set { 205 set {
206 _assetType = value; 206 _assetType = value;
207 } 207 }
208 } 208 }
209 209
210 public LLUUID AssetID { 210 public LLUUID AssetID {
211 get { 211 get {
212 return _assetID; 212 return _assetID;
213 } 213 }
214 set { 214 set {
215 _assetID = value; 215 _assetID = value;
216 } 216 }
217 } 217 }
218 } 218 }
219} 219}
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
34 public class OSUUID: IComparable 34 public class OSUUID: IComparable
35 { 35 {
36 public Guid UUID; 36 public Guid UUID;
37 37
38 public OSUUID() {} 38 public OSUUID() {}
39 39
40 /* Constructors */ 40 /* 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
154 "lsl_text", 154 "lsl_text",
155 String.Empty, 155 String.Empty,
156 String.Empty, 156 String.Empty,
157 "bodypart", 157 "bodypart",
158 String.Empty, 158 String.Empty,
159 "snapshot", 159 "snapshot",
160 String.Empty, 160 String.Empty,
161 String.Empty, 161 String.Empty,
162 "wearable", 162 "wearable",
163 "animation", 163 "animation",
164 "gesture" 164 "gesture"
165 165
166 }; 166 };
167 167
@@ -183,15 +183,15 @@ namespace OpenSim.Framework
183 "lsltext", 183 "lsltext",
184 "lslbyte", 184 "lslbyte",
185 "txtr_tga", 185 "txtr_tga",
186 "bodypart", 186 "bodypart",
187 "trash", 187 "trash",
188 "snapshot", 188 "snapshot",
189 "lstndfnd", 189 "lstndfnd",
190 "snd_wav", 190 "snd_wav",
191 "img_tga", 191 "img_tga",
192 "jpeg", 192 "jpeg",
193 "animatn", 193 "animatn",
194 "gesture" 194 "gesture"
195 }; 195 };
196 196
197 public LLUUID ItemID = LLUUID.Zero; 197 public LLUUID ItemID = LLUUID.Zero;
@@ -214,8 +214,8 @@ namespace OpenSim.Framework
214 public string Name = String.Empty; 214 public string Name = String.Empty;
215 public string Description = String.Empty; 215 public string Description = String.Empty;
216 public uint CreationDate = 0; 216 public uint CreationDate = 0;
217 public LLUUID PermsGranter; 217 public LLUUID PermsGranter;
218 public int PermsMask; 218 public int PermsMask;
219 219
220 public LLUUID ParentPartID = LLUUID.Zero; 220 public LLUUID ParentPartID = LLUUID.Zero;
221 221
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
622 } 622 }
623 return returnstring; 623 return returnstring;
624 } 624 }
625 625
626 static public XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args) 626 static public XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args)
627 { 627 {
628 return SendXmlRpcCommand(url, methodName, args); 628 return SendXmlRpcCommand(url, methodName, args);
629 } 629 }
630 630
631 static public XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args) 631 static public XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args)
632 { 632 {
633 XmlRpcRequest client = new XmlRpcRequest(methodName, args); 633 XmlRpcRequest client = new XmlRpcRequest(methodName, args);
634 return client.Send(url, 6000); 634 return client.Send(url, 6000);
635 } 635 }
636 636