aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs66
1 files changed, 33 insertions, 33 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4dc1661..a516a5a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1861,7 +1861,7 @@ namespace OpenSim.Region.Framework.Scenes
1861 { 1861 {
1862 bool welcome = true; 1862 bool welcome = true;
1863 1863
1864 if(m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId))) 1864 if (m_regInfo.EstateSettings.IsBanned(client.AgentId) && (!Permissions.IsGod(client.AgentId)))
1865 { 1865 {
1866 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", 1866 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
1867 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName); 1867 client.AgentId, client.FirstName, client.LastName, RegionInfo.RegionName);
@@ -1876,7 +1876,7 @@ namespace OpenSim.Region.Framework.Scenes
1876 welcome = false; 1876 welcome = false;
1877 } 1877 }
1878 1878
1879 if(!welcome) 1879 if (!welcome)
1880 { 1880 {
1881 try 1881 try
1882 { 1882 {
@@ -1899,46 +1899,46 @@ namespace OpenSim.Region.Framework.Scenes
1899 } 1899 }
1900 else 1900 else
1901 { 1901 {
1902 SubscribeToClientEvents(client); 1902 SubscribeToClientEvents(client);
1903 ScenePresence presence; 1903 ScenePresence presence;
1904 1904
1905 if (m_restorePresences.ContainsKey(client.AgentId)) 1905 if (m_restorePresences.ContainsKey(client.AgentId))
1906 { 1906 {
1907 m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName); 1907 m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
1908 1908
1909 presence = m_restorePresences[client.AgentId]; 1909 presence = m_restorePresences[client.AgentId];
1910 m_restorePresences.Remove(client.AgentId); 1910 m_restorePresences.Remove(client.AgentId);
1911 1911
1912 // This is one of two paths to create avatars that are 1912 // This is one of two paths to create avatars that are
1913 // used. This tends to get called more in standalone 1913 // used. This tends to get called more in standalone
1914 // than grid, not really sure why, but as such needs 1914 // than grid, not really sure why, but as such needs
1915 // an explicity appearance lookup here. 1915 // an explicity appearance lookup here.
1916 AvatarAppearance appearance = null; 1916 AvatarAppearance appearance = null;
1917 GetAvatarAppearance(client, out appearance); 1917 GetAvatarAppearance(client, out appearance);
1918 presence.Appearance = appearance; 1918 presence.Appearance = appearance;
1919 1919
1920 presence.initializeScenePresence(client, RegionInfo, this); 1920 presence.initializeScenePresence(client, RegionInfo, this);
1921 1921
1922 m_sceneGraph.AddScenePresence(presence); 1922 m_sceneGraph.AddScenePresence(presence);
1923 1923
1924 lock (m_restorePresences) 1924 lock (m_restorePresences)
1925 { 1925 {
1926 Monitor.PulseAll(m_restorePresences); 1926 Monitor.PulseAll(m_restorePresences);
1927 } 1927 }
1928 } 1928 }
1929 else 1929 else
1930 { 1930 {
1931 m_log.DebugFormat( 1931 m_log.DebugFormat(
1932 "[SCENE]: Adding new child agent for {0} in {1}", 1932 "[SCENE]: Adding new child agent for {0} in {1}",
1933 client.Name, RegionInfo.RegionName); 1933 client.Name, RegionInfo.RegionName);
1934 1934
1935 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 1935 CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
1936 1936
1937 CreateAndAddScenePresence(client); 1937 CreateAndAddScenePresence(client);
1938 } 1938 }
1939 1939
1940 m_LastLogin = Environment.TickCount; 1940 m_LastLogin = Environment.TickCount;
1941 EventManager.TriggerOnNewClient(client); 1941 EventManager.TriggerOnNewClient(client);
1942 } 1942 }
1943 } 1943 }
1944 1944