diff --git a/OpenMetaverse/AgentManager.cs b/OpenMetaverse/AgentManager.cs
index 748a616c..49387d22 100644
--- a/OpenMetaverse/AgentManager.cs
+++ b/OpenMetaverse/AgentManager.cs
@@ -1522,8 +1522,6 @@ namespace OpenMetaverse
startConference.SessionID = tmp_session_id;
- byte[] postData = StructuredData.OSDParser.SerializeLLSDXmlBytes(startConference.Serialize());
-
CapsClient request = new CapsClient(url);
request.BeginGetResponse(startConference.Serialize(), OSDFormat.Xml, Client.Settings.CAPS_TIMEOUT);
}
diff --git a/OpenMetaverse/Login.cs b/OpenMetaverse/Login.cs
index e1a8b903..2113991b 100644
--- a/OpenMetaverse/Login.cs
+++ b/OpenMetaverse/Login.cs
@@ -89,7 +89,6 @@ namespace OpenMetaverse
/// The agents starting location once logged in
/// Either "last", "home", or a string encoded URI
/// containing the simulator name and x/y/z coordinates e.g: uri:hooper&128&152&17
- ///
public string Start;
/// A string containing the client software channel information
/// Second Life Release
diff --git a/OpenMetaverse/Messages/LindenMessages.cs b/OpenMetaverse/Messages/LindenMessages.cs
index 9397e2f0..ca883214 100644
--- a/OpenMetaverse/Messages/LindenMessages.cs
+++ b/OpenMetaverse/Messages/LindenMessages.cs
@@ -50,7 +50,6 @@ namespace OpenMetaverse.Messages.Linden
public OSDMap Serialize()
{
-
OSDMap map = new OSDMap(1);
OSDArray infoArray = new OSDArray(1);
@@ -442,15 +441,9 @@ namespace OpenMetaverse.Messages.Linden
dataMap["OnlineStatus"] = OSD.FromBoolean(PrimOwnersBlock[i].OnlineStatus);
dataArray.Add(dataMap);
- /* If the tmestamp is null, don't create the DataExtended map, this
- * is usually when the parcel contains no primitives, or the agent does not have
- * permissions to see ownership information */
- if (PrimOwnersBlock[i].TimeStamp != null)
- {
- OSDMap dataExtendedMap = new OSDMap(1);
- dataExtendedMap["TimeStamp"] = OSD.FromDate(PrimOwnersBlock[i].TimeStamp);
- dataExtendedArray.Add(dataExtendedMap);
- }
+ OSDMap dataExtendedMap = new OSDMap(1);
+ dataExtendedMap["TimeStamp"] = OSD.FromDate(PrimOwnersBlock[i].TimeStamp);
+ dataExtendedArray.Add(dataExtendedMap);
}
OSDMap map = new OSDMap();
@@ -1848,7 +1841,7 @@ namespace OpenMetaverse.Messages.Linden
map.Add("agent_updates", agent_updatesMap);
- OSDMap updates = new OSDMap();
+ // OSDMap updates = new OSDMap();
map["session_id"] = OSD.FromUUID(SessionID);
diff --git a/OpenMetaverse/TexturePipeline.cs b/OpenMetaverse/TexturePipeline.cs
index f59cf1c0..0d065a54 100644
--- a/OpenMetaverse/TexturePipeline.cs
+++ b/OpenMetaverse/TexturePipeline.cs
@@ -678,8 +678,7 @@ namespace OpenMetaverse
resetEvents[task.RequestSlot].Set(); // free up request slot
_Client.Assets.Cache.SaveImageToCache(task.RequestID, task.Transfer.AssetData);
- AssetTexture asset = new AssetTexture(task.RequestID, task.Transfer.AssetData);
- task.Callback(TextureRequestState.Finished, /*task.Transfer,*/ new AssetTexture(task.RequestID, task.Transfer.AssetData));
+ task.Callback(TextureRequestState.Finished, new AssetTexture(task.RequestID, task.Transfer.AssetData));
}
else
{
diff --git a/Programs/AvatarPreview/frmAvatar.cs b/Programs/AvatarPreview/frmAvatar.cs
index bc898a39..c11ce28b 100644
--- a/Programs/AvatarPreview/frmAvatar.cs
+++ b/Programs/AvatarPreview/frmAvatar.cs
@@ -64,7 +64,7 @@ namespace AvatarPreview
string type = meshNode.Attributes.GetNamedItem("type").Value;
int lod = Int32.Parse(meshNode.Attributes.GetNamedItem("lod").Value);
string fileName = meshNode.Attributes.GetNamedItem("file_name").Value;
- string minPixelWidth = meshNode.Attributes.GetNamedItem("min_pixel_width").Value;
+ //string minPixelWidth = meshNode.Attributes.GetNamedItem("min_pixel_width").Value;
// Mash up the filename with the current path
fileName = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(dialog.FileName), fileName);
@@ -444,22 +444,5 @@ namespace AvatarPreview
return paramValues;
}
-
- private static System.Drawing.Image ConvertToRGB(System.Drawing.Image image)
- {
- int width = image.Width;
- int height = image.Height;
-
- Bitmap noAlpha = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
- Graphics graphics = Graphics.FromImage(noAlpha);
- graphics.DrawImage(image, 0, 0, width, height);
-
- return noAlpha;
- }
-
- private static bool IsPowerOfTwo(uint n)
- {
- return (n & (n - 1)) == 0 && n != 0;
- }
}
}
diff --git a/Programs/Baker/Oven.cs b/Programs/Baker/Oven.cs
index 71a38fca..485b6850 100644
--- a/Programs/Baker/Oven.cs
+++ b/Programs/Baker/Oven.cs
@@ -15,7 +15,7 @@ namespace Baker
int pixelFormatSize = Image.GetPixelFormatSize(alpha.PixelFormat) / 8;
int stride = width * pixelFormatSize;
byte[] data = new byte[stride * height];
- GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);
+ //GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);
IntPtr pointer = Marshal.UnsafeAddrOfPinnedArrayElement(data, 0);
Bitmap modified = new Bitmap(width, height, stride, alpha.PixelFormat, pointer);
@@ -50,7 +50,7 @@ namespace Baker
int pixelFormatSize = Image.GetPixelFormatSize(source.PixelFormat) / 8;
int stride = width * pixelFormatSize;
byte[] data = new byte[stride * height];
- GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);
+ //GCHandle handle = GCHandle.Alloc(data, GCHandleType.Pinned);
IntPtr pointer = Marshal.UnsafeAddrOfPinnedArrayElement(data, 0);
Bitmap modified = new Bitmap(width, height, stride, source.PixelFormat, pointer);
diff --git a/Programs/Baker/frmBaker.cs b/Programs/Baker/frmBaker.cs
index c014571d..f24ebfd0 100644
--- a/Programs/Baker/frmBaker.cs
+++ b/Programs/Baker/frmBaker.cs
@@ -35,7 +35,7 @@ namespace Baker
AlphaMask = LoadTGAClass.LoadTGA(stream);
stream.Close();
- ManagedImage managedImage = new ManagedImage(AlphaMask);
+ //ManagedImage managedImage = new ManagedImage(AlphaMask);
// FIXME: Operate on ManagedImage instead of Bitmap
pic1.Image = Oven.ModifyAlphaMask(AlphaMask, (byte)scrollWeight.Value, 0.0f);
@@ -61,28 +61,6 @@ namespace Baker
}
- private void cmdLoadShirt_Click(object sender, EventArgs e)
- {
- OpenFileDialog dialog = new OpenFileDialog();
-
-
-
- //dialog.Filter = "JPEG2000 (*.jp2,*.j2c,*.j2k)|";
- //if (dialog.ShowDialog() == DialogResult.OK)
- //{
- // try
- // {
- // byte[] j2kdata = File.ReadAllBytes(dialog.FileName);
- // Image image = OpenJPEGNet.OpenJPEG.DecodeToImage(j2kdata);
- // pic1.Image = image;
- // }
- // catch (Exception ex)
- // {
- // MessageBox.Show(ex.Message);
- // }
- //}
- }
-
private void cboMask_SelectedIndexChanged(object sender, EventArgs e)
{
DisplayResource(cboMask.Text);
diff --git a/Programs/PrimWorkshop/frmBrowser.cs b/Programs/PrimWorkshop/frmBrowser.cs
index d3c4837b..ded003d1 100644
--- a/Programs/PrimWorkshop/frmBrowser.cs
+++ b/Programs/PrimWorkshop/frmBrowser.cs
@@ -50,7 +50,7 @@ namespace PrimWorkshop
//
Vector3 PivotPosition = Vector3.Zero;
- bool Pivoting = false;
+ private bool Pivoting;
Point LastPivot;
//
@@ -693,7 +693,8 @@ namespace PrimWorkshop
// Determine the total height of the object
float minHeight = Single.MaxValue;
float maxHeight = Single.MinValue;
- float totalHeight = 0f;
+
+ //float totalHeight = 0f;
for (int i = 0; i < primList.Count; i++)
{
@@ -711,7 +712,7 @@ namespace PrimWorkshop
if (bottom < minHeight) minHeight = bottom;
}
- totalHeight = maxHeight - minHeight;
+ //totalHeight = maxHeight - minHeight;
// Create a progress bar for the import process
ProgressBar prog = new ProgressBar();
@@ -1227,15 +1228,15 @@ namespace PrimWorkshop
}
}
- int[] CubeMapDefines = new int[]
- {
- Gl.GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
- Gl.GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
- Gl.GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
- Gl.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
- Gl.GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
- Gl.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
- };
+ //int[] CubeMapDefines = new int[]
+ //{
+ // Gl.GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
+ // Gl.GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB,
+ // Gl.GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB,
+ // Gl.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB,
+ // Gl.GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB,
+ // Gl.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB
+ //};
private void RenderPrims()
{
@@ -1486,49 +1487,49 @@ StartRender:
}
}
- private void TextureDownloader_OnDownloadProgress(UUID image, int recieved, int total)
- {
- lock (DownloadList)
- {
- GlacialComponents.Controls.GLItem item;
- if (DownloadList.TryGetValue(image, out item))
- {
- // Update an existing item
- BeginInvoke(
- (MethodInvoker)delegate()
- {
- ProgressBar prog = (ProgressBar)item.SubItems[1].Control;
- if (total >= recieved)
- prog.Value = (int)Math.Round((((double)recieved / (double)total) * 100.0d));
- });
- }
- else
- {
- // Progress bar
- ProgressBar prog = new ProgressBar();
- prog.Minimum = 0;
- prog.Maximum = 100;
- if (total >= recieved)
- prog.Value = (int)Math.Round((((double)recieved / (double)total) * 100.0d));
- else
- prog.Value = 0;
+ //private void TextureDownloader_OnDownloadProgress(UUID image, int recieved, int total)
+ //{
+ // lock (DownloadList)
+ // {
+ // GlacialComponents.Controls.GLItem item;
+ // if (DownloadList.TryGetValue(image, out item))
+ // {
+ // // Update an existing item
+ // BeginInvoke(
+ // (MethodInvoker)delegate()
+ // {
+ // ProgressBar prog = (ProgressBar)item.SubItems[1].Control;
+ // if (total >= recieved)
+ // prog.Value = (int)Math.Round((((double)recieved / (double)total) * 100.0d));
+ // });
+ // }
+ // else
+ // {
+ // // Progress bar
+ // ProgressBar prog = new ProgressBar();
+ // prog.Minimum = 0;
+ // prog.Maximum = 100;
+ // if (total >= recieved)
+ // prog.Value = (int)Math.Round((((double)recieved / (double)total) * 100.0d));
+ // else
+ // prog.Value = 0;
- // List item
- item = new GlacialComponents.Controls.GLItem();
- item.SubItems[0].Text = image.ToString();
- item.SubItems[1].Control = prog;
+ // // List item
+ // item = new GlacialComponents.Controls.GLItem();
+ // item.SubItems[0].Text = image.ToString();
+ // item.SubItems[1].Control = prog;
- DownloadList[image] = item;
+ // DownloadList[image] = item;
- BeginInvoke(
- (MethodInvoker)delegate()
- {
- lstDownloads.Items.Add(item);
- lstDownloads.Invalidate();
- });
- }
- }
- }
+ // BeginInvoke(
+ // (MethodInvoker)delegate()
+ // {
+ // lstDownloads.Items.Add(item);
+ // lstDownloads.Invalidate();
+ // });
+ // }
+ // }
+ //}
#endregion Texture Downloading
diff --git a/Programs/VoiceTest/VoiceTest.cs b/Programs/VoiceTest/VoiceTest.cs
index 84a50293..74b31add 100644
--- a/Programs/VoiceTest/VoiceTest.cs
+++ b/Programs/VoiceTest/VoiceTest.cs
@@ -176,12 +176,6 @@ namespace VoiceTest
EventQueueRunningEvent.Set();
}
- static void client_OnLogMessage(string message, Helpers.LogLevel level)
- {
- if (level == Helpers.LogLevel.Warning || level == Helpers.LogLevel.Error)
- Console.WriteLine(level.ToString() + ": " + message);
- }
-
static void voice_OnProvisionAccount(string username, string password)
{
VoiceAccount = username;
diff --git a/Programs/WinGridProxy/Form1.cs b/Programs/WinGridProxy/Form1.cs
index 62e5d7e2..e4401862 100644
--- a/Programs/WinGridProxy/Form1.cs
+++ b/Programs/WinGridProxy/Form1.cs
@@ -75,7 +75,7 @@ namespace WinGridProxy
// populate the listen box with IPs
IPHostEntry iphostentry = Dns.GetHostByName(Dns.GetHostName());
- foreach(IPAddress address in iphostentry.AddressList)
+ foreach (IPAddress address in iphostentry.AddressList)
comboBoxListenAddress.Items.Add(address.ToString());
@@ -117,7 +117,7 @@ namespace WinGridProxy
{
ListViewItem foundCap = FindListViewItem(listViewMessageFilters, req.Info.CapType, false);
-
+
if (foundCap == null)
{
ListViewItem addedItem = listViewMessageFilters.Items.Add(new ListViewItem(req.Info.CapType, new ListViewGroup("EventQueue Messages")));
@@ -181,7 +181,7 @@ namespace WinGridProxy
PacketCounter++;
string loginType = (request is XmlRpcRequest) ? "Login Request" : "Login Response";
- ListViewItem session = new ListViewItem(new string[] { PacketCounter.ToString(), "HTTPS", loginType, request.ToString().Length.ToString(), comboBoxLoginURL.Text, "xml-rpc"});
+ ListViewItem session = new ListViewItem(new string[] { PacketCounter.ToString(), "HTTPS", loginType, request.ToString().Length.ToString(), comboBoxLoginURL.Text, "xml-rpc" });
session.Tag = request;
session.ImageIndex = (request is XmlRpcRequest) ? 1 : 0;
@@ -213,8 +213,8 @@ namespace WinGridProxy
PacketsOutBytes += packet.Length;
}
-
- ListViewItem session = new ListViewItem(new string[] { PacketCounter.ToString(), "UDP", packet.Type.ToString(), packet.Length.ToString(), endpoint.ToString(), "binary udp"});
+
+ ListViewItem session = new ListViewItem(new string[] { PacketCounter.ToString(), "UDP", packet.Type.ToString(), packet.Length.ToString(), endpoint.ToString(), "binary udp" });
session.Tag = packet;
session.ImageIndex = (direction == Direction.Incoming) ? 0 : 1;
listViewSessions.Items.Add(session);
@@ -243,7 +243,7 @@ namespace WinGridProxy
int size = 0;
string cType = String.Empty;
- if(req.RawRequest != null)
+ if (req.RawRequest != null)
{
size += req.RawRequest.Length;
cType = req.RequestHeaders.Get("Content-Type"); //req.RequestHeaders["Content-Type"];
@@ -406,8 +406,8 @@ namespace WinGridProxy
richTextBoxDecodedRequest.Text = String.Empty;
richTextBoxRawRequest.Text = String.Empty;
hexBoxRequest.ByteProvider = null;
- }
- else
+ }
+ else
{
richTextBoxDecodedRequest.Text = TagToString(tag, listViewSessions.FocusedItem.SubItems[2].Text);
richTextBoxRawRequest.Text = TagToString(tag, listViewSessions.FocusedItem.SubItems[2].Text);
@@ -418,7 +418,7 @@ namespace WinGridProxy
richTextBoxRawResponse.Text = String.Empty;
hexBoxResponse.ByteProvider = null;
}
-
+
}
else if (tag is CapsRequest)
{
@@ -757,18 +757,18 @@ namespace WinGridProxy
if (openFileDialog2.ShowDialog() == DialogResult.OK)
{
RestoreSavedSettings(openFileDialog2.FileName);
- if(listViewSessions.Items.Count > 0)
+ if (listViewSessions.Items.Count > 0)
{
- if(MessageBox.Show("Would you like to apply these settings to the currention session list?", "Apply Filter", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes)
+ if (MessageBox.Show("Would you like to apply these settings to the currention session list?", "Apply Filter", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes)
{
listViewSessions.BeginUpdate();
- foreach(ListViewItem item in listViewSessions.Items)
+ foreach (ListViewItem item in listViewSessions.Items)
{
ListViewItem found = FindListViewItem(listViewPacketFilters, item.SubItems[2].Text, false);
if (found == null)
found = FindListViewItem(listViewMessageFilters, item.SubItems[2].Text, false);
- if(found != null && !found.Checked)
+ if (found != null && !found.Checked)
listViewSessions.Items.Remove(item);
}
listViewSessions.EndUpdate();
@@ -814,34 +814,34 @@ namespace WinGridProxy
{
if (saveFileDialog1.ShowDialog() == DialogResult.OK)
{
- OSDMap map = new OSDMap(1);
- OSDArray sessionArray = new OSDArray();
- foreach (ListViewItem item in listViewSessions.Items)
+ OSDMap map = new OSDMap(1);
+ OSDArray sessionArray = new OSDArray();
+ foreach (ListViewItem item in listViewSessions.Items)
+ {
+ OSDMap session = new OSDMap();
+ session["name"] = OSD.FromString(item.Name);
+ session["image_index"] = OSD.FromInteger(item.ImageIndex);
+ session["id"] = OSD.FromString(item.SubItems[0].Text);
+ session["protocol"] = OSD.FromString(item.SubItems[1].Text);
+ session["packet"] = OSD.FromString(item.SubItems[2].Text);
+ session["size"] = OSD.FromString(item.SubItems[3].Text);
+ session["host"] = OSD.FromString(item.SubItems[4].Text);
+
+ try
{
- OSDMap session = new OSDMap();
- session["name"] = OSD.FromString(item.Name);
- session["image_index"] = OSD.FromInteger(item.ImageIndex);
- session["id"] = OSD.FromString(item.SubItems[0].Text);
- session["protocol"] = OSD.FromString(item.SubItems[1].Text);
- session["packet"] = OSD.FromString(item.SubItems[2].Text);
- session["size"] = OSD.FromString(item.SubItems[3].Text);
- session["host"] = OSD.FromString(item.SubItems[4].Text);
-
- try
- {
- session["tag"] = OSD.FromBinary((byte[])item.Tag);
- }
- catch
- {
- session["tag"] = OSD.FromBinary(Utils.EmptyBytes);
- }
- finally
- {
- sessionArray.Add(session);
- }
+ session["tag"] = OSD.FromBinary((byte[])item.Tag);
}
+ catch
+ {
+ session["tag"] = OSD.FromBinary(Utils.EmptyBytes);
+ }
+ finally
+ {
+ sessionArray.Add(session);
+ }
+ }
- map["sessions"] = sessionArray;
+ map["sessions"] = sessionArray;
try
{
@@ -1044,7 +1044,7 @@ namespace WinGridProxy
if (propertyInfo.GetValue(nestedArrayRecord, null).GetType() == typeof(byte[]))
{
result.AppendFormat("{0, 30}: {1}" + Environment.NewLine,
- propertyInfo.Name,
+ propertyInfo.Name,
Utils.BytesToString((byte[])propertyInfo.GetValue(nestedArrayRecord, null)));
}
}
@@ -1101,12 +1101,12 @@ namespace WinGridProxy
if (bytes.Length == 1)
{
bbDecoded = String.Format("{0}", bytes[0]);
- }
+ }
else if (bytes.Length == 17)
{
- bbDecoded = String.Format("{0} {1} ({2})",
- new UUID(bytes, 1),
- bytes[0],
+ bbDecoded = String.Format("{0} {1} ({2})",
+ new UUID(bytes, 1),
+ bytes[0],
(AssetType)bytes[0]);
}
else
@@ -1242,6 +1242,7 @@ namespace WinGridProxy
try
{
pType = packetTypeFromName(name);
+
ListViewItem found = listViewPacketFilters.FindItemWithText(name);
if (!String.IsNullOrEmpty(name) && found == null)
{
diff --git a/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs b/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs
index c2dad1d4..44a6d900 100644
--- a/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs
+++ b/Programs/examples/TestClient/Commands/Inventory/BackupCommand.cs
@@ -118,7 +118,6 @@ namespace OpenMetaverse.TestClient
public override string Execute(string[] args, UUID fromAgentID)
{
- StringBuilder sbResult = new StringBuilder();
if (args.Length == 1 && args[0] == "status")
{
@@ -250,7 +249,6 @@ namespace OpenMetaverse.TestClient
/// path so far, in the form @"c:\here" -- this needs to be "clean" for the current filesystem
private void BackupFolder(InventoryNode folder, string sPathSoFar)
{
- StringBuilder sbRequests = new StringBuilder();
// FIXME:
//Client.Inventory.RequestFolderContents(folder.Data.UUID, Client.Self.AgentID, true, true, false,
diff --git a/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs
index e5e3f7b6..30299103 100644
--- a/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs
+++ b/Programs/examples/TestClient/Commands/Inventory/ChangeDirectoryCommand.cs
@@ -7,7 +7,6 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
{
public class ChangeDirectoryCommand : Command
{
- private InventoryManager Manager;
private OpenMetaverse.Inventory Inventory;
public ChangeDirectoryCommand(TestClient client)
@@ -18,7 +17,6 @@ namespace OpenMetaverse.TestClient.Commands.Inventory.Shell
}
public override string Execute(string[] args, UUID fromAgentID)
{
- Manager = Client.Inventory;
Inventory = Client.Inventory.Store;
if (args.Length > 1)
diff --git a/Programs/examples/TestClient/Commands/Land/ParcelPrimOwnersCommand.cs b/Programs/examples/TestClient/Commands/Land/ParcelPrimOwnersCommand.cs
index 6c77e8cd..1b6d9b5a 100644
--- a/Programs/examples/TestClient/Commands/Land/ParcelPrimOwnersCommand.cs
+++ b/Programs/examples/TestClient/Commands/Land/ParcelPrimOwnersCommand.cs
@@ -51,12 +51,6 @@ namespace OpenMetaverse.TestClient
{
return String.Format("Unable to find Parcel {0} in Parcels Dictionary, Did you run parcelinfo to populate the dictionary first?", args[0]);
}
- }
-
- void Parcels_OnPrimOwnersListReply(Simulator simulator, List primOwners)
- {
- throw new Exception("The method or operation is not implemented.");
- }
-
+ }
}
}
diff --git a/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs b/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs
index 43225e9f..a1b9d0ea 100644
--- a/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs
+++ b/Programs/examples/TestClient/Commands/Movement/FollowCommand.cs
@@ -75,32 +75,6 @@ namespace OpenMetaverse.TestClient
return false;
}
- bool Follow(UUID id)
- {
- lock (Client.Network.Simulators)
- {
- for (int i = 0; i < Client.Network.Simulators.Count; i++)
- {
- Avatar target = Client.Network.Simulators[i].ObjectsAvatars.Find(
- delegate(Avatar avatar)
- {
- return avatar.ID == id;
- }
- );
-
- if (target != null)
- {
- targetLocalID = target.LocalID;
- Active = true;
- return true;
- }
- }
- }
-
- Active = false;
- return false;
- }
-
public override void Think()
{
if (Active)
diff --git a/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs b/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs
index 64c9012b..522df047 100644
--- a/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs
+++ b/Programs/examples/TestClient/Commands/Prims/ChangePermsCommand.cs
@@ -7,11 +7,10 @@ namespace OpenMetaverse.TestClient
public class ChangePermsCommand : Command
{
AutoResetEvent GotPermissionsEvent = new AutoResetEvent(false);
- UUID SelectedObject = UUID.Zero;
Dictionary Objects = new Dictionary();
PermissionMask Perms = PermissionMask.None;
- bool PermsSent = false;
- int PermCount = 0;
+ private bool PermsSent;
+ private int PermCount;
public ChangePermsCommand(TestClient testClient)
{
diff --git a/Programs/examples/TestClient/TestClient.cs b/Programs/examples/TestClient/TestClient.cs
index 294a60b1..3dc61ffe 100644
--- a/Programs/examples/TestClient/TestClient.cs
+++ b/Programs/examples/TestClient/TestClient.cs
@@ -24,10 +24,6 @@ namespace OpenMetaverse.TestClient
// Shell-like inventory commands need to be aware of the 'current' inventory folder.
public InventoryFolder CurrentDirectory = null;
- private Quaternion bodyRotation = Quaternion.Identity;
- private Vector3 forward = new Vector3(0, 0.9999f, 0);
- private Vector3 left = new Vector3(0.9999f, 0, 0);
- private Vector3 up = new Vector3(0, 0, 0.9999f);
private System.Timers.Timer updateTimer;
///
@@ -107,25 +103,6 @@ namespace OpenMetaverse.TestClient
}
}
- //breaks up large responses to deal with the max IM size
- private void SendResponseIM(GridClient client, UUID fromAgentID, string data)
- {
- for (int i = 0; i < data.Length; i += 1024)
- {
- int y;
- if ((i + 1023) > data.Length)
- {
- y = data.Length - i;
- }
- else
- {
- y = 1023;
- }
- string message = data.Substring(i, y);
- client.Self.InstantMessage(fromAgentID, message);
- }
- }
-
private void updateTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
foreach (Command c in Commands.Values)