aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorCharles Krinke2008-08-17 19:40:30 +0000
committerCharles Krinke2008-08-17 19:40:30 +0000
commit77ae4bb3fbff66ab2c9e8094c310d93702c366b8 (patch)
treea526ff8b62a3079655124a4c250ca293012e2ea9 /bin
parentAdd some locking on m_undo in SceneObjectPart (diff)
downloadopensim-SC_OLD-77ae4bb3fbff66ab2c9e8094c310d93702c366b8.zip
opensim-SC_OLD-77ae4bb3fbff66ab2c9e8094c310d93702c366b8.tar.gz
opensim-SC_OLD-77ae4bb3fbff66ab2c9e8094c310d93702c366b8.tar.bz2
opensim-SC_OLD-77ae4bb3fbff66ab2c9e8094c310d93702c366b8.tar.xz
Mantis#1971. Thank you kindly, ChrisDown for a patch that:
Reverts the deletion of the entry for "My Site Library" in bin/assets/AssetSets.xml and replace with with "Open Textures Library" pointing to "OpenTexturesLibrary/3DDCInventoryItems.xml"/.
Diffstat (limited to 'bin')
-rw-r--r--bin/assets/AssetSets.xml2
-rw-r--r--bin/inventory/Libraries.xml7
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/assets/AssetSets.xml b/bin/assets/AssetSets.xml
index ee1016e..b80aa26 100644
--- a/bin/assets/AssetSets.xml
+++ b/bin/assets/AssetSets.xml
@@ -12,7 +12,7 @@
12 12
13 13
14 <Section Name="My Asset Set"> 14 <Section Name="My Asset Set">
15 <Key Name="file" Value="OpenTexturesAssetSet/3DDCAssetSet.xml"/> 15 <Key Name="file" Value="MyAssetSet/MyAssetSet.xml"/>
16 </Section> 16 </Section>
17 17
18 18
diff --git a/bin/inventory/Libraries.xml b/bin/inventory/Libraries.xml
index b9b9e38..fe49c72 100644
--- a/bin/inventory/Libraries.xml
+++ b/bin/inventory/Libraries.xml
@@ -9,10 +9,9 @@
9 9
10 You can also add folders and items to the folders of libraries defined in this file --> 10 You can also add folders and items to the folders of libraries defined in this file -->
11 11
12 <Section Name="Open Textures Library"> 12 <Section Name="My Site Library">
13 <Key Name="foldersFile" Value="OpenTexturesLibrary/3DDCInventoryFolders.xml"/> 13 <Key Name="foldersFile" Value="MySiteLibrary/MySiteLibraryFolders.xml"/>
14 <Key Name="itemsFile" Value="OpenTexturesLibrary/3DDCInventoryItems.xml"/> 14 <Key Name="itemsFile" Value="MySiteLibrary/MySiteLibraryItems.xml"/>
15 </Section>
16 15
17 16
18<!-- comment the following to stop from loading the subfolders on login --> 17<!-- comment the following to stop from loading the subfolders on login -->