diff --git a/OpenMetaverse/AppearanceManager.cs b/OpenMetaverse/AppearanceManager.cs
index 3a9a31ad..6924b7e4 100644
--- a/OpenMetaverse/AppearanceManager.cs
+++ b/OpenMetaverse/AppearanceManager.cs
@@ -258,14 +258,13 @@ namespace OpenMetaverse
}
/// The event subscribers. null if no subcribers
- private EventHandler m_AppearanceSetReply;
+ private EventHandler m_AppearanceSet;
- /// Raises the AgentSetAppearanceReply event
- /// An AppearanceSetReplyEventArgs object containing the
- /// data returned from the data server
- protected virtual void OnAppearanceSet(AppearanceSetReplyEventArgs e)
+ /// Raises the AppearanceSet event
+ /// An AppearanceSetEventArgs object indicating if the operatin was successfull
+ protected virtual void OnAppearanceSet(AppearanceSetEventArgs e)
{
- EventHandler handler = m_AppearanceSetReply;
+ EventHandler handler = m_AppearanceSet;
if (handler != null)
handler(this, e);
}
@@ -274,14 +273,14 @@ namespace OpenMetaverse
private readonly object m_AppearanceSetLock = new object();
///
- /// Raosed when appearance data is sent to the simulator, also indicates
+ /// Raised when appearance data is sent to the simulator, also indicates
/// the main appearance thread is finished.
///
/// request.
- public event EventHandler AgentSetAppearanceReply
+ public event EventHandler AppearanceSet
{
- add { lock (m_AppearanceSetLock) { m_AppearanceSetReply += value; } }
- remove { lock (m_AppearanceSetLock) { m_AppearanceSetReply -= value; } }
+ add { lock (m_AppearanceSetLock) { m_AppearanceSet += value; } }
+ remove { lock (m_AppearanceSetLock) { m_AppearanceSet -= value; } }
}
@@ -482,7 +481,7 @@ namespace OpenMetaverse
{
AppearanceThreadRunning = 0;
- OnAppearanceSet(new AppearanceSetReplyEventArgs(success));
+ OnAppearanceSet(new AppearanceSetEventArgs(success));
}
}
);
@@ -1129,7 +1128,7 @@ namespace OpenMetaverse
bool GetAgentWearables()
{
AutoResetEvent wearablesEvent = new AutoResetEvent(false);
- EventHandler wearablesCallback = ((s,e) => wearablesEvent.Set());
+ EventHandler wearablesCallback = ((s, e) => wearablesEvent.Set());
AgentWearablesReply += wearablesCallback;
@@ -1277,7 +1276,7 @@ namespace OpenMetaverse
for (int i = 0; i < Textures.Length; i++)
{
bool isBake = false;
- for (int j=0; jContains the Event data returned from the data server from an AgentWearablesRequest
- public class AgentWearablesReplyEventArgs : EventArgs
- {
- /// Construct a new instance of the AgentWearablesReplyEventArgs class
- public AgentWearablesReplyEventArgs()
- {
- }
- }
-
- /// Contains the Event data returned from the data server from an AgentCachedTextureResponse
- public class AgentCachedBakesReplyEventArgs : EventArgs
- {
- /// Construct a new instance of the AgentCachedBakesReplyEventArgs class
- public AgentCachedBakesReplyEventArgs()
- {
- }
- }
-
- /// Contains the Event data returned from the data server from an AppearanceSetRequest
- public class AppearanceSetReplyEventArgs : EventArgs
- {
- private readonly bool m_success;
-
- /// Indicates whether appearance setting was successful
- public bool Success { get { return m_success; } }
- ///
- /// Triggered when appearance data is sent to the sim and
- /// the main appearance thread is done.
- /// Indicates whether appearance setting was successful
- public AppearanceSetReplyEventArgs(bool success)
- {
- this.m_success = success;
- }
- }
-
- /// Contains the Event data returned from the data server from an RebakeAvatarTextures
- public class RebakeAvatarTexturesEventArgs : EventArgs
- {
- private readonly UUID m_textureID;
-
- /// The ID of the Texture Layer to bake
- public UUID TextureID { get { return m_textureID; } }
-
- ///
- /// Triggered when the simulator sends a request for this agent to rebake
- /// its appearance
- ///
- /// The ID of the Texture Layer to bake
- public RebakeAvatarTexturesEventArgs(UUID textureID)
- {
- this.m_textureID = textureID;
- }
-
- }
- #endregion
}
+
+ #region AppearanceManager EventArgs Classes
+
+ /// Contains the Event data returned from the data server from an AgentWearablesRequest
+ public class AgentWearablesReplyEventArgs : EventArgs
+ {
+ /// Construct a new instance of the AgentWearablesReplyEventArgs class
+ public AgentWearablesReplyEventArgs()
+ {
+ }
+ }
+
+ /// Contains the Event data returned from the data server from an AgentCachedTextureResponse
+ public class AgentCachedBakesReplyEventArgs : EventArgs
+ {
+ /// Construct a new instance of the AgentCachedBakesReplyEventArgs class
+ public AgentCachedBakesReplyEventArgs()
+ {
+ }
+ }
+
+ /// Contains the Event data returned from an AppearanceSetRequest
+ public class AppearanceSetEventArgs : EventArgs
+ {
+ private readonly bool m_success;
+
+ /// Indicates whether appearance setting was successful
+ public bool Success { get { return m_success; } }
+ ///
+ /// Triggered when appearance data is sent to the sim and
+ /// the main appearance thread is done.
+ /// Indicates whether appearance setting was successful
+ public AppearanceSetEventArgs(bool success)
+ {
+ this.m_success = success;
+ }
+ }
+
+ /// Contains the Event data returned from the data server from an RebakeAvatarTextures
+ public class RebakeAvatarTexturesEventArgs : EventArgs
+ {
+ private readonly UUID m_textureID;
+
+ /// The ID of the Texture Layer to bake
+ public UUID TextureID { get { return m_textureID; } }
+
+ ///
+ /// Triggered when the simulator sends a request for this agent to rebake
+ /// its appearance
+ ///
+ /// The ID of the Texture Layer to bake
+ public RebakeAvatarTexturesEventArgs(UUID textureID)
+ {
+ this.m_textureID = textureID;
+ }
+
+ }
+ #endregion
}
\ No newline at end of file