diff options
author | Jeff Ames | 2008-07-23 13:24:25 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-23 13:24:25 +0000 |
commit | 80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch) | |
tree | 47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Region/Environment/Scenes/InnerScene.cs | |
parent | get rid of some LLQuaternion == null checks. Because LLQuaternion is (diff) | |
download | opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2 opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz |
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 399cbf6..7df70a0 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -1365,7 +1365,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1365 | // We need to explicitly resend the newly link prim's object properties since no other actions | 1365 | // We need to explicitly resend the newly link prim's object properties since no other actions |
1366 | // occur on link to invoke this elsewhere (such as object selection) | 1366 | // occur on link to invoke this elsewhere (such as object selection) |
1367 | parenPrim.TriggerScriptChangedEvent(Changed.LINK); | 1367 | parenPrim.TriggerScriptChangedEvent(Changed.LINK); |
1368 | if(client != null) | 1368 | if (client != null) |
1369 | parenPrim.GetProperties(client); | 1369 | parenPrim.GetProperties(client); |
1370 | else | 1370 | else |
1371 | { | 1371 | { |
@@ -1426,13 +1426,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1426 | parenPrim.DelinkFromGroup(childPrimId, sendEvents); | 1426 | parenPrim.DelinkFromGroup(childPrimId, sendEvents); |
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | if(parenPrim.Children.Count == 1) | 1429 | if (parenPrim.Children.Count == 1) |
1430 | { | 1430 | { |
1431 | // The link set has been completely torn down | 1431 | // The link set has been completely torn down |
1432 | // This is the case if you select a link set and delink | 1432 | // This is the case if you select a link set and delink |
1433 | // | 1433 | // |
1434 | parenPrim.RootPart.LinkNum = 1; | 1434 | parenPrim.RootPart.LinkNum = 1; |
1435 | if(sendEvents) | 1435 | if (sendEvents) |
1436 | parenPrim.TriggerScriptChangedEvent(Changed.LINK); | 1436 | parenPrim.TriggerScriptChangedEvent(Changed.LINK); |
1437 | } | 1437 | } |
1438 | else | 1438 | else |
@@ -1449,7 +1449,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1449 | 1449 | ||
1450 | // Tear down the remaining link set | 1450 | // Tear down the remaining link set |
1451 | // | 1451 | // |
1452 | if(unlink_ids.Count == 2) | 1452 | if (unlink_ids.Count == 2) |
1453 | { | 1453 | { |
1454 | DelinkObjects(unlink_ids, true); | 1454 | DelinkObjects(unlink_ids, true); |
1455 | return; | 1455 | return; |
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1494 | { | 1494 | { |
1495 | grp.DelinkFromGroup(primIds[i]); | 1495 | grp.DelinkFromGroup(primIds[i]); |
1496 | delinkedSomething = true; | 1496 | delinkedSomething = true; |
1497 | if(!parents.Contains(grp)) | 1497 | if (!parents.Contains(grp)) |
1498 | parents.Add(grp); | 1498 | parents.Add(grp); |
1499 | } | 1499 | } |
1500 | 1500 | ||