diff options
| author | Melanie | 2009-10-22 07:12:10 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-22 07:12:10 +0100 |
| commit | c4969d47d9bbc22b37054451cd31451ca8d8c78a (patch) | |
| tree | 788e3b034254bcf068ca950ee97a78b6aa07b386 /OpenSim/Region/OptionalModules/ContentManagementSystem | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Remove the "mel_t" from version string (diff) | |
| download | opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.zip opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.gz opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.bz2 opensim-SC-c4969d47d9bbc22b37054451cd31451ca8d8c78a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs index 0379180..e185351 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |||
| @@ -188,7 +188,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
| 188 | // MISC COMPARISONS (UUID, Byte) | 188 | // MISC COMPARISONS (UUID, Byte) |
| 189 | if (first.ClickAction != second.ClickAction) | 189 | if (first.ClickAction != second.ClickAction) |
| 190 | result |= Diff.CLICKACTION; | 190 | result |= Diff.CLICKACTION; |
| 191 | if (first.ObjectOwner != second.ObjectOwner) | 191 | if (first.OwnerID != second.OwnerID) |
| 192 | result |= Diff.OBJECTOWNER; | 192 | result |= Diff.OBJECTOWNER; |
| 193 | 193 | ||
| 194 | 194 | ||