diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /bin/inventory/AnimationsLibrary | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'bin/inventory/AnimationsLibrary')
| -rw-r--r-- | bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml index 2a6ceb4..9cfadf0 100644 --- a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml +++ b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml | |||
| @@ -108,8 +108,6 @@ | |||
| 108 | <Key Name="inventoryType" Value="19" /> | 108 | <Key Name="inventoryType" Value="19" /> |
| 109 | </Section> | 109 | </Section> |
| 110 | 110 | ||
| 111 | |||
| 112 | |||
| 113 | <!-- | 111 | <!-- |
| 114 | <Section Name="Example Library Item"> | 112 | <Section Name="Example Library Item"> |
| 115 | <Key Name="inventoryID" Value="30000000-0000-2222-4444-000000000001" /> | 113 | <Key Name="inventoryID" Value="30000000-0000-2222-4444-000000000001" /> |
| @@ -119,10 +117,6 @@ | |||
| 119 | <Key Name="name" Value="Example Library Item" /> | 117 | <Key Name="name" Value="Example Library Item" /> |
| 120 | <Key Name="assetType" Value="7" /> | 118 | <Key Name="assetType" Value="7" /> |
| 121 | <Key Name="inventoryType" Value="7" /> | 119 | <Key Name="inventoryType" Value="7" /> |
| 122 | <Key Name="currentPermissions" Value="2147483647" /> | ||
| 123 | <Key Name="nextPermissions" Value="2147483647" /> | ||
| 124 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
| 125 | <Key Name="basePermissions" Value="2147483647" /> | ||
| 126 | </Section> | 120 | </Section> |
| 127 | --> | 121 | --> |
| 128 | 122 | ||