Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-11-09 22:16:48 +0000
committer: Melanie 2010-11-09 22:16:48 +0000
commit: ee85a530f6401a7be15778f15f0e2319c714c3d4 (patch)
tree: ce3d924fe0d4c8679731c78ea8090c6ca022bdcb /OpenSim/Region/CoreModules/Avatar/Attachments
parent: Fix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
download: opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.zip
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.gz
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.bz2
opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 31eb319..6122cc2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                UUID itemID = UUID.Zero;
                if (sp != null)
                {
-                    foreach(SceneObjectGroup grp in sp.Attachments)
+                    foreach (SceneObjectGroup grp in sp.Attachments)
                    {
                        if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
                        {
author	Melanie	2010-11-09 22:16:48 +0000
committer	Melanie	2010-11-09 22:16:48 +0000
commit	ee85a530f6401a7be15778f15f0e2319c714c3d4 (patch)
tree	ce3d924fe0d4c8679731c78ea8090c6ca022bdcb /OpenSim/Region/CoreModules/Avatar/Attachments
parent	Fix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
parent	Fix parcel bans to work only on the avatars they're supposed to work on inste... (diff)
download	opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.zip opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.gz opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.bz2 opensim-SC_OLD-ee85a530f6401a7be15778f15f0e2319c714c3d4.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 31eb319..6122cc2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
179	UUID itemID = UUID.Zero;	179	UUID itemID = UUID.Zero;
180	if (sp != null)	180	if (sp != null)
181	{	181	{
182	foreach(SceneObjectGroup grp in sp.Attachments)	182	foreach (SceneObjectGroup grp in sp.Attachments)
183	{	183	{
184	if (grp.GetAttachmentPoint() == (byte)AttachmentPt)	184	if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
185	{	185	{