diff options
author | UbitUmarov | 2017-06-13 13:22:01 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-13 13:22:01 +0100 |
commit | 9526a96b4fd668c8b6d355155a8682868ae56abb (patch) | |
tree | 44aa2ca8a68bb47637717d97ab760e3ca6c9c64f /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | udp is not tcp. If mono versions have bronke udp sento, better update, also h... (diff) | |
download | opensim-SC-9526a96b4fd668c8b6d355155a8682868ae56abb.zip opensim-SC-9526a96b4fd668c8b6d355155a8682868ae56abb.tar.gz opensim-SC-9526a96b4fd668c8b6d355155a8682868ae56abb.tar.bz2 opensim-SC-9526a96b4fd668c8b6d355155a8682868ae56abb.tar.xz |
some cleanup
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 6419f11..ae827f4 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1604,13 +1604,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1604 | /// <param name="remoteClient"></param> | 1604 | /// <param name="remoteClient"></param> |
1605 | protected internal void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient) | 1605 | protected internal void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient) |
1606 | { | 1606 | { |
1607 | SceneObjectGroup group = GetGroupByPrim(localID); | 1607 | SceneObjectPart part = GetSceneObjectPart(localID); |
1608 | if(part == null) | ||
1609 | return; | ||
1608 | 1610 | ||
1609 | if (group != null) | 1611 | SceneObjectGroup group = part.ParentGroup; |
1612 | if (group != null && !group.IsDeleted) | ||
1610 | { | 1613 | { |
1611 | if (m_parentScene.Permissions.CanEditObject(group, remoteClient)) | 1614 | if (m_parentScene.Permissions.CanEditObject(group, remoteClient)) |
1612 | { | 1615 | { |
1613 | group.UpdateTextureEntry(localID, texture); | 1616 | part.UpdateTextureEntry(texture); |
1614 | } | 1617 | } |
1615 | } | 1618 | } |
1616 | } | 1619 | } |