ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster

Browse Source
This commit is contained in:
Melanie
2013-03-29 01:52:29 +00:00
parent abe885b3fe 4ad9b27530
commit 6954024fb2
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -153,10 +153,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
}
}
/// <summary>
/// RezAttachments. This should only be called upon login on the first region.
/// Attachment rezzings on crossings and TPs are done in a different way.
/// </summary>
public void RezAttachments(IScenePresence sp)
{
if (!Enabled)
@@ -165,9 +161,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (null == sp.Appearance)
{
m_log.WarnFormat("[ATTACHMENTS MODULE]: Appearance has not been initialized for agent {0}", sp.UUID);
return;
}
if (sp.GetAttachments().Count > 0)
{
// m_log.DebugFormat(
// "[ATTACHMENTS MODULE]: Not doing simulator-side attachment rez for {0} in {1} as their viewer has already rezzed attachments",
// m_scene.Name, sp.Name);
return;
}
// m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
XmlDocument doc = new XmlDocument();