diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml')
| -rw-r--r-- | bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml +++ b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml | |||
| @@ -9,10 +9,6 @@ | |||
| 9 | <Key Name="name" Value="Example Library Item" /> | 9 | <Key Name="name" Value="Example Library Item" /> |
| 10 | <Key Name="assetType" Value="7" /> | 10 | <Key Name="assetType" Value="7" /> |
| 11 | <Key Name="inventoryType" Value="7" /> | 11 | <Key Name="inventoryType" Value="7" /> |
| 12 | <Key Name="currentPermissions" Value="2147483647" /> | ||
| 13 | <Key Name="nextPermissions" Value="2147483647" /> | ||
| 14 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
| 15 | <Key Name="basePermissions" Value="2147483647" /> | ||
| 16 | </Section> | 12 | </Section> |
| 17 | --> | 13 | --> |
| 18 | 14 | ||