ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix missing ! in getassetsModule, several changes on libraryService,

Browse Source 
folder opensimlibrary as no meaning, all are child of one with that name
already"
This commit is contained in:
UbitUmarov
2022-04-23 00:33:20 +01:00
parent 6984902610
commit 8b6f9bfa0a
5 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
View File

@@ -393,7 +393,7 @@ namespace OpenSim.Region.ClientStack.Linden
else
caps.RegisterPollHandler("ViewerAsset", new PollServiceAssetEventArgs(capUrl, agentID, m_scene, hgassets));
}
else if (string.IsNullOrEmpty(m_GetAssetURL))
else if (!string.IsNullOrEmpty(m_GetAssetURL))
caps.RegisterHandler("ViewerAsset", m_GetAssetURL);
}
}

4
bin/inventory/Libraries.xml
View File

@@ -1,8 +1,6 @@
<Nini>
<Section Name="OpenSim Standard Library">
<Key Name="foldersFile" Value="OpenSimLibrary/OpenSimLibraryFolders.xml"/>
<Key Name="itemsFile" Value="OpenSimLibrary/OpenSimLibrary.xml"/>
<Key Name = "RootVersion" Value="427"/>
<Key Name = "RootVersion" Value="428"/>
</Section>
<!-- Additional libraries can be added as shown below. These folders and items can appear underneath

16
bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
View File

@@ -1,16 +0,0 @@
<Nini>
<!-- the root Opensim Library folder ID is 00000112-000f-0000-0000-000100bba000 -->
<!--
<Section Name="Example Library Item">
<Key Name="inventoryID" Value="30000000-0000-2222-4444-000000000001" />
<Key Name="assetID" Value="30000000-0000-2222-3333-000000000001" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba003"/>
<Key Name="description" Value="Example Library Item" />
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
</Section>
-->
</Nini>

14
bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml
View File

@@ -1,14 +0,0 @@
<Nini>
<!-- The root library inventory folder is hardcoded as 00000112-000f-0000-0000-000100bba000 -->
<!-- Refer to the other folders under inventory, prefference is not to add entries here -->
<!--
<Section Name="Example Library">
<Key Name="folderID" Value="12345678-1234-1234-1234-1234567890ab"/>
<Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
<Key Name="name" Value="Example Library"/>
<Key Name="type" Value="0"/>
</Section>
-->
</Nini>

5
bin/inventory/SettingsLibrary/Folders.xml
View File

@@ -4,29 +4,34 @@
<Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
<Key Name="name" Value="Settings Library"/>
<Key Name="type" Value="-1"/>
<Key Name="version" Value="2"/>
</Section>
<Section Name="Water">
<Key Name="folderID" Value="25000112-000f-0000-0000-000100bba025"/>
<Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
<Key Name="name" Value="Water"/>
<Key Name="type" Value="-1"/>
<Key Name="version" Value="2"/>
</Section>
<Section Name="Skies">
<Key Name="folderID" Value="25100112-000f-0000-0000-000100bba025"/>
<Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
<Key Name="name" Value="Skies"/>
<Key Name="type" Value="-1"/>
<Key Name="version" Value="2"/>
</Section>
<Section Name="Days">
<Key Name="folderID" Value="25200112-000f-0000-0000-000100bba025"/>
<Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
<Key Name="name" Value="Days"/>
<Key Name="type" Value="-1"/>
<Key Name="version" Value="2"/>
</Section>
<Section Name="Textures">
<Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
<Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
<Key Name="name" Value="Textures"/>
<Key Name="type" Value="-1"/>
<Key Name="version" Value="2"/>
</Section>
</Nini>