diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tools/Compiler/Program.cs | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 07466e2..4221212 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -8130,8 +8130,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8130 | //lsrp.RequestData.RequestFlags; | 8130 | //lsrp.RequestData.RequestFlags; |
8131 | //lsrp.RequestData.Filter; | 8131 | //lsrp.RequestData.Filter; |
8132 | 8132 | ||
8133 | return true; | 8133 | // return true; |
8134 | } | 8134 | } |
8135 | |||
8135 | private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack) | 8136 | private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack) |
8136 | { | 8137 | { |
8137 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; | 8138 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; |
@@ -8152,6 +8153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8152 | } | 8153 | } |
8153 | return true; | 8154 | return true; |
8154 | } | 8155 | } |
8156 | |||
8155 | private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack) | 8157 | private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack) |
8156 | { | 8158 | { |
8157 | 8159 | ||
diff --git a/OpenSim/Tools/Compiler/Program.cs b/OpenSim/Tools/Compiler/Program.cs index b18e029..249e18b 100644 --- a/OpenSim/Tools/Compiler/Program.cs +++ b/OpenSim/Tools/Compiler/Program.cs | |||
@@ -36,7 +36,8 @@ namespace OpenSim.Tools.LSL.Compiler | |||
36 | { | 36 | { |
37 | class Program | 37 | class Program |
38 | { | 38 | { |
39 | private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; | 39 | // Commented out because generated warning since m_positionMap could never be anything other than null |
40 | // private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; | ||
40 | private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); | 41 | private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); |
41 | 42 | ||
42 | static void Main(string[] args) | 43 | static void Main(string[] args) |
@@ -210,16 +211,16 @@ namespace OpenSim.Tools.LSL.Compiler | |||
210 | sfs.Close(); | 211 | sfs.Close(); |
211 | 212 | ||
212 | string posmap = String.Empty; | 213 | string posmap = String.Empty; |
213 | if (m_positionMap != null) | 214 | // if (m_positionMap != null) |
214 | { | 215 | // { |
215 | foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap) | 216 | // foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap) |
216 | { | 217 | // { |
217 | KeyValuePair<int, int> k = kvp.Key; | 218 | // KeyValuePair<int, int> k = kvp.Key; |
218 | KeyValuePair<int, int> v = kvp.Value; | 219 | // KeyValuePair<int, int> v = kvp.Value; |
219 | posmap += String.Format("{0},{1},{2},{3}\n", | 220 | // posmap += String.Format("{0},{1},{2},{3}\n", |
220 | k.Key, k.Value, v.Key, v.Value); | 221 | // k.Key, k.Value, v.Key, v.Value); |
221 | } | 222 | // } |
222 | } | 223 | // } |
223 | 224 | ||
224 | buf = enc.GetBytes(posmap); | 225 | buf = enc.GetBytes(posmap); |
225 | 226 | ||
@@ -253,7 +254,8 @@ namespace OpenSim.Tools.LSL.Compiler | |||
253 | 254 | ||
254 | private static KeyValuePair<int, int> FindErrorPosition(int line, int col) | 255 | private static KeyValuePair<int, int> FindErrorPosition(int line, int col) |
255 | { | 256 | { |
256 | return FindErrorPosition(line, col, m_positionMap); | 257 | //return FindErrorPosition(line, col, m_positionMap); |
258 | return FindErrorPosition(line, col, null); | ||
257 | } | 259 | } |
258 | 260 | ||
259 | private class kvpSorter : IComparer<KeyValuePair<int,int>> | 261 | private class kvpSorter : IComparer<KeyValuePair<int,int>> |