OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: remove some mono compiler warnings

0.6.8-post-fixes
Justin Clark-Casey (justincc) 2009-11-24 17:32:14 +00:00
parent 88ead9ee63
commit 73dcbbd57a
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -8130,8 +8130,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//lsrp.RequestData.RequestFlags; //lsrp.RequestData.RequestFlags;
//lsrp.RequestData.Filter; //lsrp.RequestData.Filter;
return true; // return true;
} }
private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack) private bool HandleRequestRegionInfo(IClientAPI sender, Packet Pack)
{ {
RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData;
@ -8152,6 +8153,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
return true; return true;
} }
private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack) private bool HandleEstateCovenantRequest(IClientAPI sender, Packet Pack)
{ {

26
OpenSim/Tools/Compiler/Program.cs
View File

@ -36,7 +36,8 @@ namespace OpenSim.Tools.LSL.Compiler
{ {
class Program class Program
{ {
private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; // Commented out because generated warning since m_positionMap could never be anything other than null
// private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap;
private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
static void Main(string[] args) static void Main(string[] args)
@ -210,16 +211,16 @@ namespace OpenSim.Tools.LSL.Compiler
sfs.Close(); sfs.Close();
string posmap = String.Empty; string posmap = String.Empty;
if (m_positionMap != null) // if (m_positionMap != null)
{ // {
foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap) // foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap)
{ // {
KeyValuePair<int, int> k = kvp.Key; // KeyValuePair<int, int> k = kvp.Key;
KeyValuePair<int, int> v = kvp.Value; // KeyValuePair<int, int> v = kvp.Value;
posmap += String.Format("{0},{1},{2},{3}\n", // posmap += String.Format("{0},{1},{2},{3}\n",
k.Key, k.Value, v.Key, v.Value); // k.Key, k.Value, v.Key, v.Value);
} // }
} // }
buf = enc.GetBytes(posmap); buf = enc.GetBytes(posmap);
@ -253,7 +254,8 @@ namespace OpenSim.Tools.LSL.Compiler
private static KeyValuePair<int, int> FindErrorPosition(int line, int col) private static KeyValuePair<int, int> FindErrorPosition(int line, int col)
{ {
return FindErrorPosition(line, col, m_positionMap); //return FindErrorPosition(line, col, m_positionMap);
return FindErrorPosition(line, col, null);
} }
private class kvpSorter : IComparer<KeyValuePair<int,int>> private class kvpSorter : IComparer<KeyValuePair<int,int>>