OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup. 

Remove old comment in SnapshotStore pointed out by ChrisDown (bug #2000)
0.6.0-stable
Jeff Ames 2008-08-19 13:07:24 +00:00
parent c74f7387ec
commit 5c360e7374
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/AvatarAppearance.cs
View File

@ -511,7 +511,7 @@ namespace OpenSim.Framework
public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset) public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset)
{ {
if(attachpoint == 0) if (attachpoint == 0)
return; return;
if (item == LLUUID.Zero) if (item == LLUUID.Zero)
@ -532,7 +532,7 @@ namespace OpenSim.Framework
{ {
foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments) foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments)
{ {
if(kvp.Value[0] == itemID) if (kvp.Value[0] == itemID)
{ {
return kvp.Key; return kvp.Key;
} }
@ -544,7 +544,7 @@ namespace OpenSim.Framework
{ {
int attachpoint = GetAttachpoint(itemID); int attachpoint = GetAttachpoint(itemID);
if(attachpoint > 0) if (attachpoint > 0)
m_attachments.Remove(attachpoint); m_attachments.Remove(attachpoint);
} }

4
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -102,9 +102,9 @@ namespace OpenSim.Region.Communications.Local
else else
{ {
// Already in our list, so the region went dead and restarted. // Already in our list, so the region went dead and restarted.
// don't replace the old regioninfo.. this might be a locking issue.. however we need to // don't replace the old regioninfo.. this might be a locking issue.. however we need to
// remove it and let it add normally below or we get extremely strange and intermittant // remove it and let it add normally below or we get extremely strange and intermittant
// connectivity errors. // connectivity errors.
// Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you
// *REALLY* know what you are doing here. // *REALLY* know what you are doing here.
m_regions.Remove(regionInfo.RegionHandle); m_regions.Remove(regionInfo.RegionHandle);

1
OpenSim/Region/DataSnapshot/SnapshotStore.cs
View File

@ -256,7 +256,6 @@ namespace OpenSim.Region.DataSnapshot
//Boolean choice between: //Boolean choice between:
// "PG" - Mormontown // "PG" - Mormontown
// "Mature" - Sodom and Gomorrah // "Mature" - Sodom and Gomorrah
// (Deprecated) "Patriotic Nigra Testing Sandbox" - Abandon Hope All Ye Who Enter Here
if (scene.RegionInfo.RegionSettings.Maturity == 1) if (scene.RegionInfo.RegionSettings.Maturity == 1)
{ {
return "Mature"; return "Mature";

8
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -2331,11 +2331,11 @@ namespace OpenSim.Region.Environment.Scenes
AttachmentPt = att.RootPart.AttachmentPoint; AttachmentPt = att.RootPart.AttachmentPoint;
ScenePresence presence; ScenePresence presence;
if(TryGetAvatar(remoteClient.AgentId, out presence)) if (TryGetAvatar(remoteClient.AgentId, out presence))
{ {
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID); presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID);
IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
if(ava != null) if (ava != null)
{ {
ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance); ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
} }
@ -2346,11 +2346,11 @@ namespace OpenSim.Region.Environment.Scenes
public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient) public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient)
{ {
ScenePresence presence; ScenePresence presence;
if(TryGetAvatar(remoteClient.AgentId, out presence)) if (TryGetAvatar(remoteClient.AgentId, out presence))
{ {
presence.Appearance.DetachAttachment(itemID); presence.Appearance.DetachAttachment(itemID);
IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
if(ava != null) if (ava != null)
{ {
ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance); ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
} }

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Scenes
public void MakeRootAgent(LLVector3 pos, bool isFlying) public void MakeRootAgent(LLVector3 pos, bool isFlying)
{ {
IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>(); IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>();
if(ava != null) if (ava != null)
{ {
ava.TryGetAvatarAppearance(m_uuid, out m_appearance); 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()); System.Console.WriteLine("Attach from world {0}", itemID.ToString());
// Attach from world // Attach from world
if(att.ParentGroup != null) if (att.ParentGroup != null)
m_scene.RezSingleAttachment(att.ParentGroup, ControllingClient, itemID, (uint)attachpoint, 0, 0); m_scene.RezSingleAttachment(att.ParentGroup, ControllingClient, itemID, (uint)attachpoint, 0, 0);
} }
else else