aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2010-07-05 03:36:26 -0700
committerDiva Canto2010-07-05 03:36:26 -0700
commitc7e4880a5e45eccea527b8e1481e911dcd0602bf (patch)
tree063619ca17b6d1cdaac7b9d2e88a5f84874dbb1a /OpenSim/Region/Framework/Scenes
parentGot rid of all hyperassets references. Also fixed accessing textures in user'... (diff)
downloadopensim-SC_OLD-c7e4880a5e45eccea527b8e1481e911dcd0602bf.zip
opensim-SC_OLD-c7e4880a5e45eccea527b8e1481e911dcd0602bf.tar.gz
opensim-SC_OLD-c7e4880a5e45eccea527b8e1481e911dcd0602bf.tar.bz2
opensim-SC_OLD-c7e4880a5e45eccea527b8e1481e911dcd0602bf.tar.xz
One more buglet fixed related to mantis #4841 -- auto-returns were still chocking on a null pointer exception.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bcb5f7c..9ba13ae 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1597,7 +1597,7 @@ namespace OpenSim.Region.Framework.Scenes
1597 } 1597 }
1598 1598
1599 // Handle god perms 1599 // Handle god perms
1600 if (Permissions.IsGod(remoteClient.AgentId)) 1600 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
1601 { 1601 {
1602 permissionToTake = true; 1602 permissionToTake = true;
1603 permissionToTakeCopy = true; 1603 permissionToTakeCopy = true;