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 | |
| parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC_OLD-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')
| -rw-r--r-- | bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | 6 | ||||
| -rw-r--r-- | bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml index c76cb78..eae9642 100644 --- a/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml +++ b/bin/assets/ScriptsAssetSet/ScriptsAssetSet.xml | |||
| @@ -89,9 +89,9 @@ | |||
| 89 | <Key Name="assetType" Value="10" /> | 89 | <Key Name="assetType" Value="10" /> |
| 90 | <Key Name="fileName" Value="llResetLandBanList.lsl" /> | 90 | <Key Name="fileName" Value="llResetLandBanList.lsl" /> |
| 91 | </Section> | 91 | </Section> |
| 92 | <Section Name="llResetLandPassList"> | 92 | <Section Name="llSay"> |
| 93 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> | 93 | <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> |
| 94 | <Key Name="name" Value="llResetLandPassList" /> | 94 | <Key Name="name" Value="llSay" /> |
| 95 | <Key Name="assetType" Value="10" /> | 95 | <Key Name="assetType" Value="10" /> |
| 96 | <Key Name="fileName" Value="llSay.lsl" /> | 96 | <Key Name="fileName" Value="llSay.lsl" /> |
| 97 | </Section> | 97 | </Section> |
| @@ -240,4 +240,4 @@ | |||
| 240 | <Key Name="fileName" Value="KanEd-Test16.lsl" /> | 240 | <Key Name="fileName" Value="KanEd-Test16.lsl" /> |
| 241 | </Section> | 241 | </Section> |
| 242 | 242 | ||
| 243 | </Nini> \ No newline at end of file | 243 | </Nini> |
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" /> |