Merge branch 'ubitwork' into avination

author: Melanie 2012-12-14 03:57:31 +0100
committer: Melanie 2012-12-14 03:57:31 +0100
commit: 1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992 (patch)
tree: 1e61c0c72389710bdf48875d38624ee1411a4f08 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
parent: Prevent a failed user relogi from throwing exceptions in poll services (diff)
parent: right fix this time ?? (diff)
download: opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.zip
opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.gz
opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.bz2
opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index a31ccac..1b4ed1e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -911,7 +911,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
            // Mimicking LLClientView which gets always set appearance from client.
            AvatarAppearance appearance;
            m_scene.GetAvatarAppearance(this, out appearance);
-            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone());
+            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize);
        }
        public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
author	Melanie	2012-12-14 03:57:31 +0100
committer	Melanie	2012-12-14 03:57:31 +0100
commit	1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992 (patch)
tree	1e61c0c72389710bdf48875d38624ee1411a4f08 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
parent	Prevent a failed user relogi from throwing exceptions in poll services (diff)
parent	right fix this time ?? (diff)
download	opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.zip opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.gz opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.bz2 opensim-SC-1d713bcdb8f63bc8c83a06acc90c2adf5d0d8992.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index a31ccac..1b4ed1e 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -911,7 +911,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
911	// Mimicking LLClientView which gets always set appearance from client.	911	// Mimicking LLClientView which gets always set appearance from client.
912	AvatarAppearance appearance;	912	AvatarAppearance appearance;
913	m_scene.GetAvatarAppearance(this, out appearance);	913	m_scene.GetAvatarAppearance(this, out appearance);
914	OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone());	914	OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize);
915	}	915	}
916		916
917	public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)	917	public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)