aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-12 23:20:38 +0000
committerJustin Clark-Casey (justincc)2010-03-12 23:20:38 +0000
commit315fa06c75d023ef3e4285842dd730a4d94b78d6 (patch)
tree370ec91ab832e2f24e57c17cf32aea5baa84953d /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.zip
opensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.tar.gz
opensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.tar.bz2
opensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.tar.xz
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7661f1e..317c908 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3738,7 +3738,7 @@ namespace OpenSim.Region.Framework.Scenes
3738 { 3738 {
3739 if (null == m_appearance) 3739 if (null == m_appearance)
3740 { 3740 {
3741 m_log.WarnFormat("[ATTACHMENT] Appearance has not been initialized for agent {0}", UUID); 3741 m_log.WarnFormat("[ATTACHMENT]: Appearance has not been initialized for agent {0}", UUID);
3742 return; 3742 return;
3743 } 3743 }
3744 3744
@@ -3762,12 +3762,12 @@ namespace OpenSim.Region.Framework.Scenes
3762 try 3762 try
3763 { 3763 {
3764 // Rez from inventory 3764 // Rez from inventory
3765 UUID asset = m_scene.RezSingleAttachment(ControllingClient, 3765 UUID asset
3766 itemID, (uint)p); 3766 = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p);
3767
3768 m_log.InfoFormat("[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})",
3769 p, itemID, assetID, asset);
3770 3767
3768 m_log.InfoFormat(
3769 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})",
3770 p, itemID, assetID, asset);
3771 } 3771 }
3772 catch (Exception e) 3772 catch (Exception e)
3773 { 3773 {