aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Framework/Communications/Capabilities
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs9
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs3
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs1
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs2
8 files changed, 14 insertions, 24 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 2eff9c2..c07744c 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -29,12 +29,11 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32 32using System.Reflection;
33using libsecondlife; 33using libsecondlife;
34 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
39 38
40namespace OpenSim.Region.Capabilities 39namespace OpenSim.Region.Capabilities
@@ -66,8 +65,8 @@ namespace OpenSim.Region.Capabilities
66 65
67 public class Caps 66 public class Caps
68 { 67 {
69 private static readonly log4net.ILog m_log = 68 private static readonly ILog m_log =
70 log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 69 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
71 70
72 private string m_httpListenerHostName; 71 private string m_httpListenerHostName;
73 private uint m_httpListenPort; 72 private uint m_httpListenPort;
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index 6992bd1..3e3ae16 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -25,14 +25,8 @@
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
28using System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Servers; 30using OpenSim.Framework.Servers;
37 31
38namespace OpenSim.Region.Capabilities 32namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
index 876b8d3..1393523 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs
@@ -25,8 +25,8 @@
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
28using libsecondlife;
29using System; 28using System;
29using libsecondlife;
30 30
31namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
32{ 32{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index fb64c75..e71a73e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -25,6 +25,7 @@
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
28using System;
28using libsecondlife; 29using libsecondlife;
29 30
30namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
@@ -32,11 +33,11 @@ namespace OpenSim.Region.Capabilities
32 [LLSDMap] 33 [LLSDMap]
33 public class LLSDAssetUploadRequest 34 public class LLSDAssetUploadRequest
34 { 35 {
35 public string asset_type = System.String.Empty; 36 public string asset_type = String.Empty;
36 public string description = System.String.Empty; 37 public string description = String.Empty;
37 public LLUUID folder_id = LLUUID.Zero; 38 public LLUUID folder_id = LLUUID.Zero;
38 public string inventory_type = System.String.Empty; 39 public string inventory_type = String.Empty;
39 public string name = System.String.Empty; 40 public string name = String.Empty;
40 41
41 public LLSDAssetUploadRequest() 42 public LLSDAssetUploadRequest()
42 { 43 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index fb721f0..bb293ba 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -25,13 +25,15 @@
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
28using System;
29
28namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
29{ 31{
30 [LLSDMap] 32 [LLSDMap]
31 public class LLSDAssetUploadResponse 33 public class LLSDAssetUploadResponse
32 { 34 {
33 public string uploader = System.String.Empty; 35 public string uploader = String.Empty;
34 public string state = System.String.Empty; 36 public string state = String.Empty;
35 37
36 public LLSDAssetUploadResponse() 38 public LLSDAssetUploadResponse()
37 { 39 {
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
index 36a2cbf..d402579 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs
@@ -25,9 +25,6 @@
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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32 29
33namespace OpenSim.Region.Capabilities 30namespace OpenSim.Region.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
index 4fb0544..4439346 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs
@@ -27,7 +27,6 @@
27*/ 27*/
28 28
29using System.Collections; 29using System.Collections;
30using libsecondlife;
31 30
32namespace OpenSim.Region.Capabilities 31namespace OpenSim.Region.Capabilities
33{ 32{
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
index 8a18213..941e70e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using libsecondlife;
30
31namespace OpenSim.Region.Capabilities 29namespace OpenSim.Region.Capabilities
32{ 30{
33 [LLSDMap] 31 [LLSDMap]