diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml')
-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" /> |