aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-07-05 03:36:26 -0700
committerDiva Canto2010-07-05 03:37:19 -0700
commit60207f670f94b1a0f1f64ab1aa7ac4d5de7a999d (patch)
tree2671da6538a8541f2ab93887847acbfd03653a2b /OpenSim/Region/Framework
parentGot rid of all hyperassets references. Also fixed accessing textures in user'... (diff)
downloadopensim-SC_OLD-60207f670f94b1a0f1f64ab1aa7ac4d5de7a999d.zip
opensim-SC_OLD-60207f670f94b1a0f1f64ab1aa7ac4d5de7a999d.tar.gz
opensim-SC_OLD-60207f670f94b1a0f1f64ab1aa7ac4d5de7a999d.tar.bz2
opensim-SC_OLD-60207f670f94b1a0f1f64ab1aa7ac4d5de7a999d.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')
-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 56d8a78..2ccb5dd 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;