diff options
author | Justin Clarke Casey | 2008-11-27 19:51:11 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-27 19:51:11 +0000 |
commit | 8ba6b2b11a37b660e26b01fa04ce00ac4fab3e90 (patch) | |
tree | cf136293d1fd7cd72e4d6d0474e79a2068f9ad2b /OpenSim | |
parent | * Remove unused and largely unimplemented UpdateUserCurrentRegion() (diff) | |
download | opensim-SC_OLD-8ba6b2b11a37b660e26b01fa04ce00ac4fab3e90.zip opensim-SC_OLD-8ba6b2b11a37b660e26b01fa04ce00ac4fab3e90.tar.gz opensim-SC_OLD-8ba6b2b11a37b660e26b01fa04ce00ac4fab3e90.tar.bz2 opensim-SC_OLD-8ba6b2b11a37b660e26b01fa04ce00ac4fab3e90.tar.xz |
* minor: remove mono compiler warnings
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index 992e84d..bd74166 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
@@ -97,7 +97,6 @@ namespace OpenSim.Data.MySQL | |||
97 | { | 97 | { |
98 | errorSeen = true; | 98 | errorSeen = true; |
99 | continue; | 99 | continue; |
100 | continue; | ||
101 | } | 100 | } |
102 | throw; | 101 | throw; |
103 | } | 102 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e3b91a5..7dac5de 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3490,7 +3490,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3490 | handlerGenericMessage(sender, method, msg); | 3490 | handlerGenericMessage(sender, method, msg); |
3491 | return true; | 3491 | return true; |
3492 | } | 3492 | } |
3493 | catch (Exception ex) | 3493 | catch |
3494 | { | 3494 | { |
3495 | } | 3495 | } |
3496 | } | 3496 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 2a8bba8..e664fb0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
83 | private int m_ControlEventsInQueue = 0; | 83 | private int m_ControlEventsInQueue = 0; |
84 | private int m_LastControlLevel = 0; | 84 | private int m_LastControlLevel = 0; |
85 | private bool m_CollisionInQueue = false; | 85 | private bool m_CollisionInQueue = false; |
86 | private ISponsor m_ScriptSponsor; | 86 | //private ISponsor m_ScriptSponsor; |
87 | private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> | 87 | private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> |
88 | m_LineMap; | 88 | m_LineMap; |
89 | 89 | ||
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
213 | ISponsor scriptSponsor = new ScriptSponsor(); | 213 | ISponsor scriptSponsor = new ScriptSponsor(); |
214 | ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject); | 214 | ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as MarshalByRefObject); |
215 | lease.Register(scriptSponsor); | 215 | lease.Register(scriptSponsor); |
216 | m_ScriptSponsor = scriptSponsor; | 216 | //m_ScriptSponsor = scriptSponsor; |
217 | 217 | ||
218 | } | 218 | } |
219 | catch (Exception e) | 219 | catch (Exception e) |