Merge branch 'justincc-master'

master-beforevarregion
Justin Clark-Casey (justincc) 2014-01-10 20:52:50 +00:00
commit 66e2e1c9c3
2 changed files with 4 additions and 4 deletions

View File

@ -89,9 +89,9 @@
<Key Name="assetType" Value="10" /> <Key Name="assetType" Value="10" />
<Key Name="fileName" Value="llResetLandBanList.lsl" /> <Key Name="fileName" Value="llResetLandBanList.lsl" />
</Section> </Section>
<Section Name="llResetLandPassList"> <Section Name="llSay">
<Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" /> <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" />
<Key Name="name" Value="llResetLandPassList" /> <Key Name="name" Value="llSay" />
<Key Name="assetType" Value="10" /> <Key Name="assetType" Value="10" />
<Key Name="fileName" Value="llSay.lsl" /> <Key Name="fileName" Value="llSay.lsl" />
</Section> </Section>
@ -240,4 +240,4 @@
<Key Name="fileName" Value="KanEd-Test16.lsl" /> <Key Name="fileName" Value="KanEd-Test16.lsl" />
</Section> </Section>
</Nini> </Nini>

View File

@ -195,7 +195,7 @@
<!-- S == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> --> <!-- S == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> -->
<Section Name="llSay"> <Section Name="llSay">
<Key Name="inventoryID" Value="3af51d20-b38f-11dc-8314-0800200c9a66" /> <Key Name="inventoryID" Value="3af51d20-b38f-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="3af51d21-b38f-11dc-8314-0800200c9a66" /> <Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/>
<Key Name="description" Value="llS" /> <Key Name="description" Value="llS" />
<Key Name="name" Value="llSay" /> <Key Name="name" Value="llSay" />