diff options
| author | Robert Adams | 2014-01-11 08:52:23 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-11 08:52:23 -0800 |
| commit | 1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f (patch) | |
| tree | 125392101f83c8e7cb239848ae7a6cc12595b1a2 /bin/inventory/ScriptsLibrary | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Fix crash in BulletSim which sometimes happens making a linkset physical (diff) | |
| download | opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.zip opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.gz opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.bz2 opensim-SC-1cf17a3cf7322b79d44ef80b9129c975f0cf4f6f.tar.xz | |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
Diffstat (limited to 'bin/inventory/ScriptsLibrary')
| -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" /> |