diff options
| author | Melanie | 2010-02-14 22:27:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-14 22:27:39 +0000 |
| commit | 2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch) | |
| tree | 1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Region/Framework/Scenes | |
| parent | Resolve a merge issue (diff) | |
| parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
| download | opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 12f0489..4d357fd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3147,7 +3147,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3147 | m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName); | 3147 | m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName); |
| 3148 | appearance = new AvatarAppearance(client.AgentId); | 3148 | appearance = new AvatarAppearance(client.AgentId); |
| 3149 | } | 3149 | } |
| 3150 | |||
| 3151 | } | 3150 | } |
| 3152 | 3151 | ||
| 3153 | /// <summary> | 3152 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1b7ca8b..6a2ab02 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2701,6 +2701,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2701 | /// </summary> | 2701 | /// </summary> |
| 2702 | public void SendWearables() | 2702 | public void SendWearables() |
| 2703 | { | 2703 | { |
| 2704 | m_log.DebugFormat("[SCENE]: Received request for wearables of {0}", Name); | ||
| 2705 | |||
| 2704 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 2706 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
| 2705 | } | 2707 | } |
| 2706 | 2708 | ||