diff options
| author | Adam Frisby | 2009-02-22 12:39:46 +0000 |
|---|---|---|
| committer | Adam Frisby | 2009-02-22 12:39:46 +0000 |
| commit | 3cd5ffa82a3f511594746ebde129ed180693b7c8 (patch) | |
| tree | dc6f66dab37d8bfbfe84b65ee58a95ad4e7b77aa /OpenSim | |
| parent | Part 1 of refactoring the userserver. Changed it so instead of subclassing th... (diff) | |
| download | opensim-SC-3cd5ffa82a3f511594746ebde129ed180693b7c8.zip opensim-SC-3cd5ffa82a3f511594746ebde129ed180693b7c8.tar.gz opensim-SC-3cd5ffa82a3f511594746ebde129ed180693b7c8.tar.bz2 opensim-SC-3cd5ffa82a3f511594746ebde129ed180693b7c8.tar.xz | |
* Fixes an assumption whereby Scene assumes that each client is capable of producing a circuit. This affects non-Linden derived viewers who do not utilize circuits.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0caec5b..659aaa6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2114,6 +2114,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2114 | public void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) | 2114 | public void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) |
| 2115 | { | 2115 | { |
| 2116 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); | 2116 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); |
| 2117 | |||
| 2118 | if(aCircuit == null) | ||
| 2119 | { | ||
| 2120 | m_log.DebugFormat("[APPEARANCE] Client did not supply a circuit. Non-Linden? Creating default appearance."); | ||
| 2121 | appearance = new AvatarAppearance(client.AgentId); | ||
| 2122 | return; | ||
| 2123 | } | ||
| 2124 | |||
| 2117 | appearance = aCircuit.Appearance; | 2125 | appearance = aCircuit.Appearance; |
| 2118 | if (appearance == null) | 2126 | if (appearance == null) |
| 2119 | { | 2127 | { |