diff options
author | Jeff Ames | 2009-02-02 09:01:00 +0000 |
---|---|---|
committer | Jeff Ames | 2009-02-02 09:01:00 +0000 |
commit | 496ed4488d756591e8200f1defc83a7fd2ce2dd7 (patch) | |
tree | 7199ae23bfd07635144e2418f1f66a426ff78593 | |
parent | * Adding the Tree module configuration options to OpenSim.ini.example (diff) | |
download | opensim-SC-496ed4488d756591e8200f1defc83a7fd2ce2dd7.zip opensim-SC-496ed4488d756591e8200f1defc83a7fd2ce2dd7.tar.gz opensim-SC-496ed4488d756591e8200f1defc83a7fd2ce2dd7.tar.bz2 opensim-SC-496ed4488d756591e8200f1defc83a7fd2ce2dd7.tar.xz |
Minor formatting cleanup.
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs index d02f6e3..30f5675 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -434,7 +434,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | |||
434 | _log.ErrorFormat("[Concierge] broker update to {0} failed with status {1}", uri, we.Status); | 434 | _log.ErrorFormat("[Concierge] broker update to {0} failed with status {1}", uri, we.Status); |
435 | if (null != we.Response) | 435 | if (null != we.Response) |
436 | { | 436 | { |
437 | using(HttpWebResponse resp = we.Response as HttpWebResponse) | 437 | using (HttpWebResponse resp = we.Response as HttpWebResponse) |
438 | { | 438 | { |
439 | _log.ErrorFormat("[Concierge] response from {0} status code: {1}", uri, resp.StatusCode); | 439 | _log.ErrorFormat("[Concierge] response from {0} status code: {1}", uri, resp.StatusCode); |
440 | _log.ErrorFormat("[Concierge] response from {0} status desc: {1}", uri, resp.StatusDescription); | 440 | _log.ErrorFormat("[Concierge] response from {0} status desc: {1}", uri, resp.StatusDescription); |
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index a1261cb..f6b82a3 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator | |||
143 | { | 143 | { |
144 | if (activeYN) | 144 | if (activeYN) |
145 | { | 145 | { |
146 | CalculateTrees = new Timer(m_tree_updates); | 146 | CalculateTrees = new Timer(m_tree_updates); |
147 | CalculateTrees.Elapsed += CalculateTrees_Elapsed; | 147 | CalculateTrees.Elapsed += CalculateTrees_Elapsed; |
148 | CalculateTrees.Start(); | 148 | CalculateTrees.Start(); |
149 | } | 149 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 79b30c7..f439f34 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -24,6 +24,7 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System.Collections; | 28 | using System.Collections; |
28 | using OpenSim.Region.ScriptEngine.Interfaces; | 29 | using OpenSim.Region.ScriptEngine.Interfaces; |
29 | 30 | ||
@@ -66,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
66 | 67 | ||
67 | // Teleport commands | 68 | // Teleport commands |
68 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 69 | void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
69 | void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 70 | void osTeleportAgent(string agent, uint regionX, uint regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
70 | void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); | 71 | void osTeleportAgent(string agent, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); |
71 | 72 | ||
72 | // Animation commands | 73 | // Animation commands |