aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/SnapshotStore.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
5 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 81cf372..a287201 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -511,7 +511,7 @@ namespace OpenSim.Framework
511 511
512 public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset) 512 public void SetAttachment(int attachpoint, LLUUID item, LLUUID asset)
513 { 513 {
514 if(attachpoint == 0) 514 if (attachpoint == 0)
515 return; 515 return;
516 516
517 if (item == LLUUID.Zero) 517 if (item == LLUUID.Zero)
@@ -532,7 +532,7 @@ namespace OpenSim.Framework
532 { 532 {
533 foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments) 533 foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments)
534 { 534 {
535 if(kvp.Value[0] == itemID) 535 if (kvp.Value[0] == itemID)
536 { 536 {
537 return kvp.Key; 537 return kvp.Key;
538 } 538 }
@@ -544,7 +544,7 @@ namespace OpenSim.Framework
544 { 544 {
545 int attachpoint = GetAttachpoint(itemID); 545 int attachpoint = GetAttachpoint(itemID);
546 546
547 if(attachpoint > 0) 547 if (attachpoint > 0)
548 m_attachments.Remove(attachpoint); 548 m_attachments.Remove(attachpoint);
549 } 549 }
550 550
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index c0e6722..a2e1e0c 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -102,9 +102,9 @@ namespace OpenSim.Region.Communications.Local
102 else 102 else
103 { 103 {
104 // Already in our list, so the region went dead and restarted. 104 // Already in our list, so the region went dead and restarted.
105 // don't replace the old regioninfo.. this might be a locking issue.. however we need to 105 // don't replace the old regioninfo.. this might be a locking issue.. however we need to
106 // remove it and let it add normally below or we get extremely strange and intermittant 106 // remove it and let it add normally below or we get extremely strange and intermittant
107 // connectivity errors. 107 // connectivity errors.
108 // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you 108 // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you
109 // *REALLY* know what you are doing here. 109 // *REALLY* know what you are doing here.
110 m_regions.Remove(regionInfo.RegionHandle); 110 m_regions.Remove(regionInfo.RegionHandle);
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index e8b8383..e1a6651 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -256,7 +256,6 @@ namespace OpenSim.Region.DataSnapshot
256 //Boolean choice between: 256 //Boolean choice between:
257 // "PG" - Mormontown 257 // "PG" - Mormontown
258 // "Mature" - Sodom and Gomorrah 258 // "Mature" - Sodom and Gomorrah
259 // (Deprecated) "Patriotic Nigra Testing Sandbox" - Abandon Hope All Ye Who Enter Here
260 if (scene.RegionInfo.RegionSettings.Maturity == 1) 259 if (scene.RegionInfo.RegionSettings.Maturity == 1)
261 { 260 {
262 return "Mature"; 261 return "Mature";
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index e145f4a..171868b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2331,11 +2331,11 @@ namespace OpenSim.Region.Environment.Scenes
2331 AttachmentPt = att.RootPart.AttachmentPoint; 2331 AttachmentPt = att.RootPart.AttachmentPoint;
2332 2332
2333 ScenePresence presence; 2333 ScenePresence presence;
2334 if(TryGetAvatar(remoteClient.AgentId, out presence)) 2334 if (TryGetAvatar(remoteClient.AgentId, out presence))
2335 { 2335 {
2336 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID); 2336 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID);
2337 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); 2337 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
2338 if(ava != null) 2338 if (ava != null)
2339 { 2339 {
2340 ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2340 ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2341 } 2341 }
@@ -2346,11 +2346,11 @@ namespace OpenSim.Region.Environment.Scenes
2346 public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient) 2346 public void DetachSingleAttachmentToInv(LLUUID itemID, IClientAPI remoteClient)
2347 { 2347 {
2348 ScenePresence presence; 2348 ScenePresence presence;
2349 if(TryGetAvatar(remoteClient.AgentId, out presence)) 2349 if (TryGetAvatar(remoteClient.AgentId, out presence))
2350 { 2350 {
2351 presence.Appearance.DetachAttachment(itemID); 2351 presence.Appearance.DetachAttachment(itemID);
2352 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); 2352 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
2353 if(ava != null) 2353 if (ava != null)
2354 { 2354 {
2355 ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 2355 ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
2356 } 2356 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index af7ae47..8059a78 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Scenes
607 public void MakeRootAgent(LLVector3 pos, bool isFlying) 607 public void MakeRootAgent(LLVector3 pos, bool isFlying)
608 { 608 {
609 IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>(); 609 IAvatarFactory ava = m_scene.RequestModuleInterface<IAvatarFactory>();
610 if(ava != null) 610 if (ava != null)
611 { 611 {
612 ava.TryGetAvatarAppearance(m_uuid, out m_appearance); 612 ava.TryGetAvatarAppearance(m_uuid, out m_appearance);
613 } 613 }
@@ -2887,7 +2887,7 @@ namespace OpenSim.Region.Environment.Scenes
2887 { 2887 {
2888 System.Console.WriteLine("Attach from world {0}", itemID.ToString()); 2888 System.Console.WriteLine("Attach from world {0}", itemID.ToString());
2889 // Attach from world 2889 // Attach from world
2890 if(att.ParentGroup != null) 2890 if (att.ParentGroup != null)
2891 m_scene.RezSingleAttachment(att.ParentGroup, ControllingClient, itemID, (uint)attachpoint, 0, 0); 2891 m_scene.RezSingleAttachment(att.ParentGroup, ControllingClient, itemID, (uint)attachpoint, 0, 0);
2892 } 2892 }
2893 else 2893 else