Index: OpenMetaverse.Rendering.Meshmerizer/Meshmerizer.cs =================================================================== --- OpenMetaverse.Rendering.Meshmerizer/Meshmerizer.cs (revision 2281) +++ OpenMetaverse.Rendering.Meshmerizer/Meshmerizer.cs (working copy) @@ -191,7 +191,7 @@ } int numCoords = primMesh.coords.Count; - int numFaces = primMesh.faces.Count; + //int numFaces = primMesh.faces.Count; List coords = primMesh.coords; for (int i = 0; i < numCoords; i++) Index: OpenMetaverse.Utilities/VoiceManager.cs =================================================================== --- OpenMetaverse.Utilities/VoiceManager.cs (revision 2281) +++ OpenMetaverse.Utilities/VoiceManager.cs (working copy) @@ -126,14 +126,14 @@ private bool isModeratorMuted = false; private bool isSpeaking = false; private int cookie = 0; - private int returnCode = 0; + //private int returnCode = 0; private int statusCode = 0; private int volume = 0; private int state = 0; private int participantType = 0; private float energy = 0f; private string statusString = String.Empty; - private string uuidString = String.Empty; + //private string uuidString = String.Empty; private string actionString = String.Empty; private string connectorHandle = String.Empty; private string accountHandle = String.Empty; @@ -142,7 +142,7 @@ private string eventTypeString = String.Empty; private string uriString = String.Empty; private string nameString = String.Empty; - private string audioMediaString = String.Empty; + //private string audioMediaString = String.Empty; private string displayNameString = String.Empty; #endregion Response Processing Variables @@ -605,9 +605,9 @@ switch (reader.Name) { - case "requestId": - uuidString = reader.Value; - break; +// case "requestId": +// uuidString = reader.Value; +// break; case "action": actionString = reader.Value; break; @@ -653,9 +653,9 @@ case "RenderDevices": _RenderDevices.Clear(); break; - case "ReturnCode": - returnCode = reader.ReadElementContentAsInt(); - break; +// case "ReturnCode": +// returnCode = reader.ReadElementContentAsInt(); +// break; case "StatusCode": statusCode = reader.ReadElementContentAsInt(); break; @@ -683,9 +683,9 @@ case "Name": nameString = reader.ReadElementContentAsString(); break; - case "AudioMedia": - audioMediaString = reader.ReadElementContentAsString(); - break; +// case "AudioMedia": +// audioMediaString = reader.ReadElementContentAsString(); +// break; case "ChannelName": nameString = reader.ReadElementContentAsString(); break; Index: OpenMetaverse.Utilities/RegistrationApi.cs =================================================================== --- OpenMetaverse.Utilities/RegistrationApi.cs (revision 2281) +++ OpenMetaverse.Utilities/RegistrationApi.cs (working copy) @@ -215,7 +215,7 @@ { if (response is LLSDMap) { - LLSDMap respTable = (LLSDMap)response; + //LLSDMap respTable = (LLSDMap)response; //FIXME: //_lastNames = new List(respTable.Count); @@ -246,7 +246,7 @@ LLSDMap query = new LLSDMap(); query.Add("username", LLSD.FromString(firstName)); query.Add("last_name_id", LLSD.FromInteger(lastName.ID)); - byte[] postData = LLSDParser.SerializeXmlBytes(query); + //byte[] postData = LLSDParser.SerializeXmlBytes(query); CapsClient request = new CapsClient(_caps.CheckName); request.OnComplete += new CapsClient.CompleteCallback(CheckNameResponse); @@ -311,7 +311,7 @@ query.Add("start_look_at_z", LLSD.FromReal(user.StartLookAt.Value.Z)); } - byte[] postData = LLSDParser.SerializeXmlBytes(query); + //byte[] postData = LLSDParser.SerializeXmlBytes(query); // Make the request CapsClient request = new CapsClient(_caps.CreateUser); Index: Programs/GridProxy/Plugins/ClientAO.cs =================================================================== --- Programs/GridProxy/Plugins/ClientAO.cs (revision 2281) +++ Programs/GridProxy/Plugins/ClientAO.cs (working copy) @@ -149,18 +149,18 @@ } } - private PacketDelegate _transferInfoDelegate; - private PacketDelegate transferInfoDelegate - { - get - { - if (_transferInfoDelegate == null) - { - _transferInfoDelegate = new PacketDelegate(TransferInfoHandler); - } - return _transferInfoDelegate; - } - } +// private PacketDelegate _transferInfoDelegate; +// private PacketDelegate transferInfoDelegate +// { +// get +// { +// if (_transferInfoDelegate == null) +// { +// _transferInfoDelegate = new PacketDelegate(TransferInfoHandler); +// } +// return _transferInfoDelegate; +// } +// } #endregion @@ -556,10 +556,10 @@ } //return the name of an animation by its UUID - private string animname(UUID arg) - { - return animuid2name[arg]; - } +// private string animname(UUID arg) +// { +// return animuid2name[arg]; +// } //handle animation packets from simulator private Packet AnimationPacketHandler(Packet packet, IPEndPoint sim) { @@ -614,30 +614,30 @@ } //handle packets that contain info about the notecard data transfer - private Packet TransferInfoHandler(Packet packet, IPEndPoint simulator) - { - TransferInfoPacket info = (TransferInfoPacket)packet; - - if (info.TransferInfo.TransferID == assetdownloadID) - { - //this is our requested tranfer, handle it - downloadsize = info.TransferInfo.Size; +// private Packet TransferInfoHandler(Packet packet, IPEndPoint simulator) +// { +// TransferInfoPacket info = (TransferInfoPacket)packet; +// +// if (info.TransferInfo.TransferID == assetdownloadID) +// { +// //this is our requested tranfer, handle it +// downloadsize = info.TransferInfo.Size; +// +// if ((StatusCode)info.TransferInfo.Status != StatusCode.OK) +// { +// SayToUser("Failed to read notecard"); +// } +// if (downloadedbytes >= downloadsize) +// { +// //Download already completed! +// downloadCompleted(); +// } +// //intercept packet +// return null; +// } +// return packet; +// } - if ((StatusCode)info.TransferInfo.Status != StatusCode.OK) - { - SayToUser("Failed to read notecard"); - } - if (downloadedbytes >= downloadsize) - { - //Download already completed! - downloadCompleted(); - } - //intercept packet - return null; - } - return packet; - } - //handle packets which contain the notecard data private Packet TransferPacketHandler(Packet packet, IPEndPoint simulator) { Index: Programs/GridProxy/GridProxy.cs =================================================================== --- Programs/GridProxy/GridProxy.cs (revision 2281) +++ Programs/GridProxy/GridProxy.cs (working copy) @@ -357,7 +357,7 @@ for (; ; ) { Socket client = loginServer.Accept(); - IPEndPoint clientEndPoint = (IPEndPoint)client.RemoteEndPoint; + //IPEndPoint clientEndPoint = (IPEndPoint)client.RemoteEndPoint; try { @@ -569,9 +569,8 @@ } private Dictionary KnownCaps; - private Dictionary SubHack = new Dictionary(); + //private Dictionary SubHack = new Dictionary(); - private void ProxyCaps(NetworkStream netStream, string meth, string uri, Dictionary headers, byte[] content, int reqNo) { Match match = new Regex(@"^(https?)://([^:/]+)(:\d+)?(/.*)$").Match(uri); @@ -1380,7 +1379,7 @@ // SimProxy: proxy for a single simulator private class SimProxy { - private ProxyConfig proxyConfig; + //private ProxyConfig proxyConfig; private IPEndPoint remoteEndPoint; private Proxy proxy; private Socket socket; @@ -1398,7 +1397,7 @@ // SimProxy: construct a proxy for a single simulator public SimProxy(ProxyConfig proxyConfig, IPEndPoint simEndPoint, Proxy proxy) { - this.proxyConfig = proxyConfig; + //this.proxyConfig = proxyConfig; remoteEndPoint = new IPEndPoint(simEndPoint.Address, simEndPoint.Port); this.proxy = proxy; socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); @@ -1848,7 +1847,7 @@ int ackCount = packet.Header.AckList.Length; for (int i = 0; i < ackCount; ++i) { - int offset = length - (ackCount - i) * 4 - 1; + //int offset = length - (ackCount - i) * 4 - 1; uint ackID = packet.Header.AckList[i] - theirOffset; #if DEBUG_SEQUENCE uint hrup = packet.Header.AckList[i]; Index: OpenMetaverse.GUI/MiniMap.cs =================================================================== --- OpenMetaverse.GUI/MiniMap.cs (revision 2281) +++ OpenMetaverse.GUI/MiniMap.cs (working copy) @@ -72,7 +72,7 @@ { Bitmap bmp = new Bitmap(256, 256); Graphics g = Graphics.FromImage(bmp); - SolidBrush brush = new SolidBrush(Color.FromArgb(90, 32, 32, 32)); + //SolidBrush brush = new SolidBrush(Color.FromArgb(90, 32, 32, 32)); g.Clear(this.BackColor); Index: OpenMetaverse/Capabilities/HttpServer.cs =================================================================== --- OpenMetaverse/Capabilities/HttpServer.cs (revision 2281) +++ OpenMetaverse/Capabilities/HttpServer.cs (working copy) @@ -63,16 +63,16 @@ HttpListener server; AsyncCallback serverCallback; - int serverPort; - bool sslEnabled; + //int serverPort; + //bool sslEnabled; List requestHandlers; bool isRunning; public HttpServer(int port, bool ssl) { - serverPort = port; - sslEnabled = ssl; + //serverPort = port; + //sslEnabled = ssl; server = new HttpListener(); serverCallback = new AsyncCallback(BeginGetContextCallback); Index: OpenMetaverse/InventoryManager.cs =================================================================== --- OpenMetaverse/InventoryManager.cs (revision 2281) +++ OpenMetaverse/InventoryManager.cs (working copy) @@ -788,7 +788,7 @@ private GridClient _Client; private Inventory _Store; - private Random _RandNumbers = new Random(); + //private Random _RandNumbers = new Random(); private object _CallbacksLock = new object(); private uint _CallbackPos; private Dictionary _ItemCreatedCallbacks = new Dictionary(); @@ -2549,8 +2549,6 @@ private static bool ParseLine(string line, out string key, out string value) { - string origLine = line; - // Clean up and convert tabs to spaces line = line.Trim(); line = line.Replace('\t', ' '); @@ -2943,7 +2941,7 @@ private void SaveAssetIntoInventoryHandler(Packet packet, Simulator simulator) { - SaveAssetIntoInventoryPacket save = (SaveAssetIntoInventoryPacket)packet; + //SaveAssetIntoInventoryPacket save = (SaveAssetIntoInventoryPacket)packet; // FIXME: Find this item in the inventory structure and mark the parent as needing an update //save.InventoryData.ItemID; Index: OpenMetaverse/AppearanceManager.cs =================================================================== --- OpenMetaverse/AppearanceManager.cs (revision 2281) +++ OpenMetaverse/AppearanceManager.cs (working copy) @@ -477,7 +477,7 @@ public void AddAttachments(List attachments, bool removeExistingFirst) { // FIXME: Obey this - const int OBJECTS_PER_PACKET = 4; + //const int OBJECTS_PER_PACKET = 4; // Use RezMultipleAttachmentsFromInv to clear out current attachments, and attach new ones RezMultipleAttachmentsFromInvPacket attachmentsPacket = new RezMultipleAttachmentsFromInvPacket(); @@ -1032,7 +1032,7 @@ private void UploadBake(Baker bake) { // Upload the completed layer data - UUID transactionID = Assets.RequestUpload(bake.BakedTexture, true); + Assets.RequestUpload(bake.BakedTexture, true); Logger.DebugLog(String.Format("Bake {0} completed. Uploading asset {1}", bake.BakeType, bake.BakedTexture.AssetID.ToString()), Client); Index: OpenMetaverse/Inventory.cs =================================================================== --- OpenMetaverse/Inventory.cs (revision 2281) +++ OpenMetaverse/Inventory.cs (working copy) @@ -144,7 +144,7 @@ private UUID _Owner; private GridClient Client; - private InventoryManager Manager; + //private InventoryManager Manager; private Dictionary Items = new Dictionary(); public Inventory(GridClient client, InventoryManager manager) @@ -153,7 +153,7 @@ public Inventory(GridClient client, InventoryManager manager, UUID owner) { Client = client; - Manager = manager; + //Manager = manager; _Owner = owner; if (owner == UUID.Zero) Logger.Log("Inventory owned by nobody!", Helpers.LogLevel.Warning, Client); Index: OpenMetaverse/AssetManager.cs =================================================================== --- OpenMetaverse/AssetManager.cs (revision 2281) +++ OpenMetaverse/AssetManager.cs (working copy) @@ -1055,11 +1055,11 @@ else if (download.Source == SourceType.SimInventoryItem && info.TransferInfo.Params.Length == 100) { // TODO: Can we use these? - UUID agentID = new UUID(info.TransferInfo.Params, 0); - UUID sessionID = new UUID(info.TransferInfo.Params, 16); - UUID ownerID = new UUID(info.TransferInfo.Params, 32); - UUID taskID = new UUID(info.TransferInfo.Params, 48); - UUID itemID = new UUID(info.TransferInfo.Params, 64); + //UUID agentID = new UUID(info.TransferInfo.Params, 0); + //UUID sessionID = new UUID(info.TransferInfo.Params, 16); + //UUID ownerID = new UUID(info.TransferInfo.Params, 32); + //UUID taskID = new UUID(info.TransferInfo.Params, 48); + //UUID itemID = new UUID(info.TransferInfo.Params, 64); download.AssetID = new UUID(info.TransferInfo.Params, 80); download.AssetType = (AssetType)(sbyte)info.TransferInfo.Params[96]; Index: OpenMetaverse/Simulator.cs =================================================================== --- OpenMetaverse/Simulator.cs (revision 2281) +++ OpenMetaverse/Simulator.cs (working copy) @@ -342,8 +342,8 @@ /// true if map is full (contains no 0's) public bool IsParcelMapFull() { - int ny = this.ParcelMap.GetLength(0); - int nx = this.ParcelMap.GetLength(1); + //int ny = this.ParcelMap.GetLength(0); + //int nx = this.ParcelMap.GetLength(1); for (int y = 0; y < 64; y++) { for (int x = 0; x < 64; x++) Index: OpenMetaverse/CapsToPacket.cs =================================================================== --- OpenMetaverse/CapsToPacket.cs (revision 2281) +++ OpenMetaverse/CapsToPacket.cs (working copy) @@ -250,7 +250,6 @@ if (proptype.Equals(LLSDType.Binary)) { - byte[] bytes = blockData[property.Name].AsBinary(); set.Invoke(block, new object[] { blockData[property.Name].AsBinary() }); } else Index: OpenMetaverse/TerrainCompressor.cs =================================================================== --- OpenMetaverse/TerrainCompressor.cs (revision 2281) +++ OpenMetaverse/TerrainCompressor.cs (working copy) @@ -69,7 +69,7 @@ private static readonly float[] DequantizeTable16 = new float[16 * 16]; private static readonly float[] DequantizeTable32 = new float[16 * 16]; private static readonly float[] CosineTable16 = new float[16 * 16]; - private static readonly float[] CosineTable32 = new float[16 * 16]; + //private static readonly float[] CosineTable32 = new float[16 * 16]; private static readonly int[] CopyMatrix16 = new int[16 * 16]; private static readonly int[] CopyMatrix32 = new int[16 * 16]; private static readonly float[] QuantizeTable16 = new float[16 * 16]; Index: OpenMetaverse/Primitives/Primitive.cs =================================================================== --- OpenMetaverse/Primitives/Primitive.cs (revision 2281) +++ OpenMetaverse/Primitives/Primitive.cs (working copy) @@ -583,7 +583,6 @@ get { bool linearPath = (PathCurve == PathCurve.Line || PathCurve == PathCurve.Flexible); - float scaleX = PathScaleX; float scaleY = PathScaleY; if (linearPath) Index: OpenMetaverse/AgentManager.cs =================================================================== --- OpenMetaverse/AgentManager.cs (revision 2281) +++ OpenMetaverse/AgentManager.cs (working copy) @@ -3041,7 +3041,7 @@ //string errormsg = map["error"].AsString(); - LLSDMap updates = (LLSDMap)map["updates"]; + //LLSDMap updates = (LLSDMap)map["updates"]; // Handle any agent data updates LLSDMap agent_updates = (LLSDMap)map["agent_updates"]; @@ -3086,7 +3086,7 @@ // handle parts else if (record["transition"].AsString().Equals("LEAVE")) { - if (fndMbr.AvatarKey != null) + if (fndMbr.AvatarKey != UUID.Zero) lock (GroupChatSessions.Dictionary) GroupChatSessions[sessionID].Remove(fndMbr); @@ -3208,7 +3208,7 @@ { LLSDMap map = (LLSDMap)llsd; LLSDMap im = (LLSDMap)map["instantmessage"]; - LLSDMap agent = (LLSDMap)im["agent_params"]; + //LLSDMap agent = (LLSDMap)im["agent_params"]; LLSDMap msg = (LLSDMap)im["message_params"]; LLSDMap msgdata = (LLSDMap)msg["data"]; Index: OpenMetaverse/Voice/TCPPipe.cs =================================================================== --- OpenMetaverse/Voice/TCPPipe.cs (revision 2281) +++ OpenMetaverse/Voice/TCPPipe.cs (working copy) @@ -168,7 +168,7 @@ int end = packet.TCPSocket.EndReceive(asyn); char[] chars = new char[end + 1]; System.Text.Decoder d = System.Text.Encoding.UTF8.GetDecoder(); - int charLen = d.GetChars(packet.DataBuffer, 0, end, chars, 0); + d.GetChars(packet.DataBuffer, 0, end, chars, 0); System.String data = new System.String(chars); ReceiveData(data); WaitForData(); Index: OpenMetaverse/ObjectManager.cs =================================================================== --- OpenMetaverse/ObjectManager.cs (revision 2281) +++ OpenMetaverse/ObjectManager.cs (working copy) @@ -298,7 +298,7 @@ protected GridClient Client; /// Does periodic dead reckoning calculation to convert /// velocity and acceleration to new positions for objects - private Timer InterpolationTimer; + //private Timer InterpolationTimer; /// /// Instantiates a new ObjectManager class @@ -339,7 +338,9 @@ // If the callbacks aren't registered there's not point in doing client-side path prediction, // so we set it up here - InterpolationTimer = new Timer(new TimerCallback(InterpolationTimer_Elapsed), null, Settings.INTERPOLATION_INTERVAL, + //InterpolationTimer = new Timer(new TimerCallback(InterpolationTimer_Elapsed), null, Settings.INTERPOLATION_INTERVAL, + // Settings.INTERPOLATION_INTERVAL); + new Timer(new TimerCallback(InterpolationTimer_Elapsed), null, Settings.INTERPOLATION_INTERVAL, Settings.INTERPOLATION_INTERVAL); } Index: OpenMetaverse/EstateTools.cs =================================================================== --- OpenMetaverse/EstateTools.cs (revision 2281) +++ OpenMetaverse/EstateTools.cs (working copy) @@ -226,7 +226,7 @@ EstateOwnerMessagePacket message = (EstateOwnerMessagePacket)packet; uint estateID; string method = Utils.BytesToString(message.MethodData.Method); - List parameters = new List(); + //List parameters = new List(); if (method == "estateupdateinfo") { Index: OpenMetaverse/Login.cs =================================================================== --- OpenMetaverse/Login.cs (revision 2281) +++ OpenMetaverse/Login.cs (working copy) @@ -969,7 +969,7 @@ return; } - CapsClient loginRequest = new CapsClient(new Uri(loginParams.URI)); + CapsClient loginRequest = new CapsClient(loginUri); loginRequest.OnComplete += new CapsClient.CompleteCallback(LoginReplyHandler); loginRequest.UserData = CurrentContext; loginRequest.StartRequest(LLSDParser.SerializeXmlBytes(loginLLSD), "application/xml+llsd"); Index: OpenMetaverse.Tests/NetworkTests.cs =================================================================== --- OpenMetaverse.Tests/NetworkTests.cs (revision 2281) +++ OpenMetaverse.Tests/NetworkTests.cs (working copy) @@ -38,11 +38,11 @@ { GridClient Client; - ulong CurrentRegionHandle = 0; + //ulong CurrentRegionHandle = 0; //ulong AhernRegionHandle = 1096213093149184; //ulong MorrisRegionHandle = 1096213093149183; //ulong DoreRegionHandle = 1095113581521408; - ulong HooperRegionHandle = 1106108697797888; + //ulong HooperRegionHandle = 1106108697797888; bool DetectedObject = false; public NetworkTests() @@ -69,7 +69,7 @@ { Assert.IsTrue(Client.Network.Connected, "Client is not connected to the grid"); - int start = Environment.TickCount; + //int start = Environment.TickCount; Assert.AreEqual("hooper", Client.Network.CurrentSim.Name.ToLower(), "Logged in to sim " + Client.Network.CurrentSim.Name + " instead of hooper"); @@ -173,10 +173,10 @@ private void ObjectUpdateHandler(Packet packet, Simulator sim) { - ObjectUpdatePacket update = (ObjectUpdatePacket)packet; + //ObjectUpdatePacket update = (ObjectUpdatePacket)packet; DetectedObject = true; - CurrentRegionHandle = update.RegionData.RegionHandle; + //CurrentRegionHandle = update.RegionData.RegionHandle; } [TearDown]