diff options
| author | Melanie | 2014-01-28 20:47:36 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 20:47:36 +0000 |
| commit | 4ccb15290ea9686070311c8a62c0fd9e6b0787d8 (patch) | |
| tree | 5c4f69879983e87f567e11c59d8d8b83d0bd7bb4 /bin/inventory | |
| parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/inventory')
| -rw-r--r-- | bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml index df9d867..6e51d0b 100644 --- a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml +++ b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml | |||
| @@ -195,7 +195,7 @@ | |||
| 195 | <!-- S == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> --> | 195 | <!-- S == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> --> |
| 196 | <Section Name="llSay"> | 196 | <Section Name="llSay"> |
| 197 | <Key Name="inventoryID" Value="3af51d20-b38f-11dc-8314-0800200c9a66" /> | 197 | <Key Name="inventoryID" Value="3af51d20-b38f-11dc-8314-0800200c9a66" /> |
| 198 | <Key Name="assetID" Value="3af51d21-b38f-11dc-8314-0800200c9a66" /> | 198 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> |
| 199 | <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> | 199 | <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> |
| 200 | <Key Name="description" Value="llS" /> | 200 | <Key Name="description" Value="llS" /> |
| 201 | <Key Name="name" Value="llSay" /> | 201 | <Key Name="name" Value="llSay" /> |