Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-05-06 16:08:24 +0100
committer: Melanie 2010-05-06 16:08:24 +0100
commit: 533bd1bd9b25f6c754493beb11e38777570db728 (patch)
tree: 96680eacb7bb1eb224536f12cb624a3a7f453839 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
parent: Ensure the show in search flag is cleared on ownership change. Also, when (diff)
parent: * Fixes Library bugs in grid mode. Partly a missing check and partly a missin... (diff)
download: opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.zip
opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.tar.gz
opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.tar.bz2
opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index bc10230..e25b1f1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -513,8 +513,8 @@ namespace OpenSim.Region.Framework.Scenes
        {
            // FIXME MAYBE: We're not handling sortOrder!
-            // TODO: This code for looking in the folder for the library should be folded back into the
+            // TODO: This code for looking in the folder for the library should be folded somewhere else
-            // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
+            // so that this class doesn't have to know the details (and so that multiple libraries, etc.
            // can be handled transparently).
            InventoryFolderImpl fold = null;
            if (LibraryService != null && LibraryService.LibraryRootFolder != null)
author	Melanie	2010-05-06 16:08:24 +0100
committer	Melanie	2010-05-06 16:08:24 +0100
commit	533bd1bd9b25f6c754493beb11e38777570db728 (patch)
tree	96680eacb7bb1eb224536f12cb624a3a7f453839 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
parent	Ensure the show in search flag is cleared on ownership change. Also, when (diff)
parent	* Fixes Library bugs in grid mode. Partly a missing check and partly a missin... (diff)
download	opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.zip opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.tar.gz opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.tar.bz2 opensim-SC_OLD-533bd1bd9b25f6c754493beb11e38777570db728.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index bc10230..e25b1f1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -513,8 +513,8 @@ namespace OpenSim.Region.Framework.Scenes
513	{	513	{
514	// FIXME MAYBE: We're not handling sortOrder!	514	// FIXME MAYBE: We're not handling sortOrder!
515		515
516	// TODO: This code for looking in the folder for the library should be folded back into the	516	// TODO: This code for looking in the folder for the library should be folded somewhere else
517	// CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.	517	// so that this class doesn't have to know the details (and so that multiple libraries, etc.
518	// can be handled transparently).	518	// can be handled transparently).
519	InventoryFolderImpl fold = null;	519	InventoryFolderImpl fold = null;
520	if (LibraryService != null && LibraryService.LibraryRootFolder != null)	520	if (LibraryService != null && LibraryService.LibraryRootFolder != null)