From 281ad1251ced13931ddbf99671841ef87db6ec0a Mon Sep 17 00:00:00 2001
From: Rob Smart
Date: Wed, 16 Sep 2009 13:34:14 +0100
Subject: updated the IAuthorizationService interface so that a message is
 passed back and can be displayed at the client when an avatar is denied
 access to a region

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0c2f991..80f3e4d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3253,10 +3253,11 @@ namespace OpenSim.Region.Framework.Scenes
                       
             if (AuthorizationService != null)
             {
-                if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString()))
+                if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString(),out reason))
                 {
                     m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
                                      agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
+                    //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName);
                     return false;    
                 }
             }
-- 
cgit v1.1


From 35260faead29c590bf01c1eb02130cfac22c38ad Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 16 Sep 2009 18:20:55 +0100
Subject: on iar save/load, let the user know if they put in the wrong password
 refactor GetUserInfo() to eliminate copypasta

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0c2f991..a8028a6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -994,9 +994,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     // Loop it
                     if (m_frame == Int32.MaxValue)
-                        m_frame = 0;
-
-                    
+                        m_frame = 0;                   
 
                     otherMS = Environment.TickCount;
                     // run through all entities looking for updates (slow)
@@ -1017,7 +1015,6 @@ namespace OpenSim.Region.Framework.Scenes
                         m_sceneGraph.UpdateEntities();
                     }
 
-
                     // run through entities that have scheduled themselves for
                     // updates looking for updates(faster)
                     if (m_frame % m_update_entitiesquick == 0)
-- 
cgit v1.1