aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-06-29 00:28:22 +0100
committerJustin Clark-Casey (justincc)2011-06-29 00:28:22 +0100
commit22f25fae387a801e8545f6ab6e2c9700926ae6e4 (patch)
tree5a0e57a655aaecba82f7819896dfef7c9a52705a /OpenSim/Region/CoreModules/Framework
parent[PATCH 2/2] [FIX] osGetPrimitiveParams() and osSetPrimitiveParams() (diff)
downloadopensim-SC_OLD-22f25fae387a801e8545f6ab6e2c9700926ae6e4.zip
opensim-SC_OLD-22f25fae387a801e8545f6ab6e2c9700926ae6e4.tar.gz
opensim-SC_OLD-22f25fae387a801e8545f6ab6e2c9700926ae6e4.tar.bz2
opensim-SC_OLD-22f25fae387a801e8545f6ab6e2c9700926ae6e4.tar.xz
Hack around with the NPC module to get osNpcCreate() partially working again.
This now creates an avatar but appearance is always cloudy. Move doesn't work. Really, creating an NPC should only involve a ScenePresence rather than doing anything with IClientAPI, since an NPC has no viewer to communicate with!
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index accd094..a4861ec 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -297,9 +297,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
297 if (m_UserCache.ContainsKey(id)) 297 if (m_UserCache.ContainsKey(id))
298 return; 298 return;
299 299
300// m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, craetorData {1}", id, creatorData);
301
300 UserData user = new UserData(); 302 UserData user = new UserData();
301 user.Id = id; 303 user.Id = id;
302
303 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id); 304 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
304 305
305 if (account != null) 306 if (account != null)