diff options
| author | teravus | 2012-12-19 11:53:26 -0500 |
|---|---|---|
| committer | teravus | 2012-12-19 11:53:26 -0500 |
| commit | c648325d7c761beb2ebe0edff3a70fdfbc81ffdb (patch) | |
| tree | 831779e20f7c21037d2bfcb4dc1985412c364e6b /OpenSim/Region/OptionalModules | |
| parent | * This is a better way to do the last commit. (diff) | |
| parent | Add the interfaces for the new Avination baked texture cache service (diff) | |
| download | opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.zip opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.gz opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.bz2 opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.xz | |
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 |
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 | |||
| 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) |