diff options
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index f40b373..0582586 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -1546,8 +1546,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1546 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) | 1546 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) |
| 1547 | { | 1547 | { |
| 1548 | SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID); | 1548 | SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID); |
| 1549 | part.ClickAction = Convert.ToByte(clickAction); | 1549 | if (part != null) |
| 1550 | group.HasGroupChanged = true; | 1550 | { |
| 1551 | part.ClickAction = Convert.ToByte(clickAction); | ||
| 1552 | group.HasGroupChanged = true; | ||
| 1553 | } | ||
| 1551 | } | 1554 | } |
| 1552 | } | 1555 | } |
| 1553 | } | 1556 | } |
| @@ -1560,8 +1563,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1560 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) | 1563 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) |
| 1561 | { | 1564 | { |
| 1562 | SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID); | 1565 | SceneObjectPart part = m_parentScene.GetSceneObjectPart(primLocalID); |
| 1563 | part.Material = Convert.ToByte(material); | 1566 | if (part != null) |
| 1564 | group.HasGroupChanged = true; | 1567 | { |
| 1568 | part.Material = Convert.ToByte(material); | ||
| 1569 | group.HasGroupChanged = true; | ||
| 1570 | } | ||
| 1565 | } | 1571 | } |
| 1566 | } | 1572 | } |
| 1567 | } | 1573 | } |