aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
diff options
context:
space:
mode:
authorMelanie2010-05-06 16:09:36 +0100
committerMelanie2010-05-06 16:09:36 +0100
commit11971fb3027bdd2f8ee28bd439d34ac43c053b25 (patch)
tree08c112e3af57e7d10d8e7a6317afc725159a3228 /OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
parentRemove the m_Viewer variable and make the property a shortcut to the (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-11971fb3027bdd2f8ee28bd439d34ac43c053b25.zip
opensim-SC_OLD-11971fb3027bdd2f8ee28bd439d34ac43c053b25.tar.gz
opensim-SC_OLD-11971fb3027bdd2f8ee28bd439d34ac43c053b25.tar.bz2
opensim-SC_OLD-11971fb3027bdd2f8ee28bd439d34ac43c053b25.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs4
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
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)