diff options
Diffstat (limited to 'OpenSim/Region')
5 files changed, 12 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 39bda70..4027377 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1242,8 +1242,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1242 | /// Send terrain layer information to the client. | 1242 | /// Send terrain layer information to the client. |
1243 | /// </summary> | 1243 | /// </summary> |
1244 | /// <param name="o"></param> | 1244 | /// <param name="o"></param> |
1245 | private void DoSendWindData(object o) | 1245 | //private void DoSendWindData(object o) |
1246 | { | 1246 | //{ |
1247 | //float[] map = (float[])o; | 1247 | //float[] map = (float[])o; |
1248 | 1248 | ||
1249 | //try | 1249 | //try |
@@ -1268,7 +1268,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1268 | //{ | 1268 | //{ |
1269 | // m_log.Warn("[CLIENT]: ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString()); | 1269 | // m_log.Warn("[CLIENT]: ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString()); |
1270 | // } | 1270 | // } |
1271 | } | 1271 | //} |
1272 | 1272 | ||
1273 | /// <summary> | 1273 | /// <summary> |
1274 | /// Sends a set of four patches (x, x+1, ..., x+3) to the client | 1274 | /// Sends a set of four patches (x, x+1, ..., x+3) to the client |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index 8d422aa..be8aeea 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs | |||
@@ -26,8 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | //using System.Reflection; |
30 | using log4net; | 30 | //using log4net; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Scenes; | 33 | using OpenSim.Region.Environment.Scenes; |
@@ -37,8 +37,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
37 | { | 37 | { |
38 | public class AgentAssetTransactionsManager | 38 | public class AgentAssetTransactionsManager |
39 | { | 39 | { |
40 | private static readonly ILog m_log | 40 | //private static readonly ILog m_log |
41 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Each agent has its own singleton collection of transactions | 44 | /// Each agent has its own singleton collection of transactions |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs index 9c0888a..5484ad5 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -55,7 +55,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
55 | private IClientAPI ourClient; | 55 | private IClientAPI ourClient; |
56 | private UUID TransactionID = UUID.Zero; | 56 | private UUID TransactionID = UUID.Zero; |
57 | private sbyte type = 0; | 57 | private sbyte type = 0; |
58 | private bool UploadComplete; | ||
59 | private byte wearableType = 0; | 58 | private byte wearableType = 0; |
60 | public ulong XferID; | 59 | public ulong XferID; |
61 | 60 | ||
@@ -140,15 +139,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
140 | 139 | ||
141 | protected void RequestStartXfer() | 140 | protected void RequestStartXfer() |
142 | { | 141 | { |
143 | UploadComplete = false; | ||
144 | XferID = Util.GetNextXferID(); | 142 | XferID = Util.GetNextXferID(); |
145 | ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); | 143 | ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); |
146 | } | 144 | } |
147 | 145 | ||
148 | protected void SendCompleteMessage() | 146 | protected void SendCompleteMessage() |
149 | { | 147 | { |
150 | UploadComplete = true; | ||
151 | |||
152 | ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID); | 148 | ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID); |
153 | 149 | ||
154 | m_finished = true; | 150 | m_finished = true; |
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs index d7bc42f..fced389 100644 --- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs | |||
@@ -140,10 +140,10 @@ namespace OpenSim.Region.Environment.Modules | |||
140 | //m_log.Debug("[WIND]:Regenerating..."); | 140 | //m_log.Debug("[WIND]:Regenerating..."); |
141 | GenWindPos(); // Generate shared values once | 141 | GenWindPos(); // Generate shared values once |
142 | 142 | ||
143 | int spotxp = 0; | 143 | //int spotxp = 0; |
144 | int spotyp = 0; | 144 | //int spotyp = 0; |
145 | int spotxm = 0; | 145 | //int spotxm = 0; |
146 | int spotym = 0; | 146 | //int spotym = 0; |
147 | List<ScenePresence> avatars = m_scene.GetAvatars(); | 147 | List<ScenePresence> avatars = m_scene.GetAvatars(); |
148 | foreach (ScenePresence avatar in avatars) | 148 | foreach (ScenePresence avatar in avatars) |
149 | { | 149 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs index 1bcccf1..b5a7196 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
72 | 72 | ||
73 | private Executor m_Exec; | 73 | private Executor m_Exec; |
74 | 74 | ||
75 | private string m_state = "default"; | 75 | //private string m_state = "default"; |
76 | 76 | ||
77 | public void state(string newState) | 77 | public void state(string newState) |
78 | { | 78 | { |