Update svn properties, minor formatting cleanup.
Remove old comment in SnapshotStore pointed out by ChrisDown (bug #2000)0.6.0-stable
parent
c74f7387ec
commit
5c360e7374
|
@ -511,7 +511,7 @@ namespace OpenSim.Framework
|
|||
|
||||
public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset)
|
||||
{
|
||||
if(attachpoint == 0)
|
||||
if (attachpoint == 0)
|
||||
return;
|
||||
|
||||
if (item == LLUUID.Zero)
|
||||
|
@ -532,7 +532,7 @@ namespace OpenSim.Framework
|
|||
{
|
||||
foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments)
|
||||
{
|
||||
if(kvp.Value[0] == itemID)
|
||||
if (kvp.Value[0] == itemID)
|
||||
{
|
||||
return kvp.Key;
|
||||
}
|
||||
|
@ -544,7 +544,7 @@ namespace OpenSim.Framework
|
|||
{
|
||||
int attachpoint = GetAttachpoint(itemID);
|
||||
|
||||
if(attachpoint > 0)
|
||||
if (attachpoint > 0)
|
||||
m_attachments.Remove(attachpoint);
|
||||
}
|
||||
|
||||
|
|
|
@ -256,7 +256,6 @@ namespace OpenSim.Region.DataSnapshot
|
|||
//Boolean choice between:
|
||||
// "PG" - Mormontown
|
||||
// "Mature" - Sodom and Gomorrah
|
||||
// (Deprecated) "Patriotic Nigra Testing Sandbox" - Abandon Hope All Ye Who Enter Here
|
||||
if (scene.RegionInfo.RegionSettings.Maturity == 1)
|
||||
{
|
||||
return "Mature";
|
||||
|
|
|
@ -2331,11 +2331,11 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
AttachmentPt = att.RootPart.AttachmentPoint;
|
||||
|
||||
ScenePresence presence;
|
||||
if(TryGetAvatar(remoteClient.AgentId, out presence))
|
||||
if (TryGetAvatar(remoteClient.AgentId, out presence))
|
||||
{
|
||||
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID);
|
||||
IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
|
||||
if(ava != null)
|
||||
if (ava != null)
|
||||
{
|
||||
ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
|
||||
}
|
||||
|
@ -2346,11 +2346,11 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient)
|
||||
{
|
||||
ScenePresence presence;
|
||||
if(TryGetAvatar(remoteClient.AgentId, out presence))
|
||||
if (TryGetAvatar(remoteClient.AgentId, out presence))
|
||||
{
|
||||
presence.Appearance.DetachAttachment(itemID);
|
||||
IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
|
||||
if(ava != null)
|
||||
if (ava != null)
|
||||
{
|
||||
ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
|
||||
}
|
||||
|
|
|
@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
public void MakeRootAgent(LLVector3 pos, bool isFlying)
|
||||
{
|
||||
IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>();
|
||||
if(ava != null)
|
||||
if (ava != null)
|
||||
{
|
||||
ava.TryGetAvatarAppearance(m_uuid, out m_appearance);
|
||||
}
|
||||
|
@ -2887,7 +2887,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
{
|
||||
System.Console.WriteLine("Attach from world {0}", itemID.ToString());
|
||||
// Attach from world
|
||||
if(att.ParentGroup != null)
|
||||
if (att.ParentGroup != null)
|
||||
m_scene.RezSingleAttachment(att.ParentGroup, ControllingClient, itemID, (uint)attachpoint, 0, 0);
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue