From 8f0b03597b0bc8ea6873af9a55495407fae1ec56 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 19 Sep 2007 00:30:55 +0000 Subject: * Modernized ScriptManager to new interface-based module calls. * 'remove redundant this qualifier' ftw --- .../Interfaces/IDynamicTextureManager.cs | 21 +++++++++++---------- .../Region/Environment/Interfaces/IHttpRequests.cs | 9 +++------ .../Environment/Interfaces/IRegionDataStore.cs | 9 ++------- .../Region/Environment/Interfaces/IRegionModule.cs | 10 ++++------ OpenSim/Region/Environment/Interfaces/ISimChat.cs | 9 +++------ OpenSim/Region/Environment/Interfaces/ITerrain.cs | 16 ++++++++-------- OpenSim/Region/Environment/Interfaces/IXfer.cs | 6 +----- 7 files changed, 32 insertions(+), 48 deletions(-) (limited to 'OpenSim/Region/Environment/Interfaces') diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs index 727b386..05cecf8 100644 --- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs @@ -1,17 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.IO; -using libsecondlife; - +using System.IO; +using libsecondlife; + namespace OpenSim.Region.Environment.Interfaces { public interface IDynamicTextureManager { void RegisterRender(string handleType, IDynamicTextureRender render); - void ReturnData(LLUUID id, byte[] data); - LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, int updateTimer); - LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams, int updateTimer); + void ReturnData(LLUUID id, byte[] data); + + LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, + int updateTimer); + + LLUUID AddDynamicTextureData(LLUUID simID, LLUUID primID, string contentType, string data, string extraParams, + int updateTimer); } public interface IDynamicTextureRender @@ -24,4 +25,4 @@ namespace OpenSim.Region.Environment.Interfaces bool AsyncConvertUrl(LLUUID id, string url, string extraParams); bool AsyncConvertData(LLUUID id, string bodyData, string extraParams); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs index e974e25..cb00b48 100644 --- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Text; -using libsecondlife; - +using libsecondlife; + namespace OpenSim.Region.Environment.Interfaces { public interface IHttpRequests { LLUUID MakeHttpRequest(string url, string type, string body); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs index 89a0e8c..1a00f2c 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs @@ -26,15 +26,10 @@ * */ +using System.Collections.Generic; using libsecondlife; - -using OpenSim.Framework.Types; -using OpenSim.Region; -using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.LandManagement; - -using System.Collections.Generic; +using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Interfaces { diff --git a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs b/OpenSim/Region/Environment/Interfaces/IRegionModule.cs index 47f3d92..981b73f 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IRegionModule.cs @@ -1,15 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Text; - +using OpenSim.Region.Environment.Scenes; + namespace OpenSim.Region.Environment.Interfaces { public interface IRegionModule { - void Initialise(Scenes.Scene scene); + void Initialise(Scene scene); void PostInitialise(); void CloseDown(); string GetName(); bool IsSharedModule(); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Interfaces/ISimChat.cs b/OpenSim/Region/Environment/Interfaces/ISimChat.cs index f0adabc..5aa78ab 100644 --- a/OpenSim/Region/Environment/Interfaces/ISimChat.cs +++ b/OpenSim/Region/Environment/Interfaces/ISimChat.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Text; -using libsecondlife; - +using libsecondlife; + namespace OpenSim.Region.Environment.Interfaces { public interface ISimChat { void SimChat(byte[] message, byte type, int channel, LLVector3 fromPos, string fromName, LLUUID fromAgentID); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Environment/Interfaces/ITerrain.cs index 576c5b4..f9ff71a 100644 --- a/OpenSim/Region/Environment/Interfaces/ITerrain.cs +++ b/OpenSim/Region/Environment/Interfaces/ITerrain.cs @@ -1,16 +1,16 @@ -using System; -using System.Collections.Generic; -using System.Text; -using OpenSim.Framework.Interfaces; - +using OpenSim.Framework.Interfaces; + namespace OpenSim.Region.Environment.Interfaces { public interface ITerrain { bool Tainted(); bool Tainted(int x, int y); - void ResetTaint(); - void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, IClientAPI remoteUser); + void ResetTaint(); + + void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, + IClientAPI remoteUser); + void CheckHeightValues(); float[] GetHeights1D(); float[,] GetHeights2D(); @@ -43,4 +43,4 @@ namespace OpenSim.Region.Environment.Interfaces void ExportImage(string filename, string gradientmap); byte[] ExportJpegImage(string gradientmap); } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Environment/Interfaces/IXfer.cs b/OpenSim/Region/Environment/Interfaces/IXfer.cs index 7482ec0..6fd4d6f 100644 --- a/OpenSim/Region/Environment/Interfaces/IXfer.cs +++ b/OpenSim/Region/Environment/Interfaces/IXfer.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace OpenSim.Region.Environment.Interfaces { public interface IXfer { bool AddNewFile(string fileName, byte[] data); } -} +} \ No newline at end of file -- cgit v1.1