diff options
| author | Melanie | 2009-08-15 19:00:56 +0100 |
|---|---|---|
| committer | Melanie | 2009-08-15 19:00:56 +0100 |
| commit | 973be659459c577433b831c451ff07048aa078be (patch) | |
| tree | 887f0586edbb936cca2fb8381699d921a2299492 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Changed FromAssetID to FromItemID (diff) | |
| download | opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.zip opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.gz opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.bz2 opensim-SC_OLD-973be659459c577433b831c451ff07048aa078be.tar.xz | |
Merge branch 'master' of ../opensim-diva/ into inventory-connector
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4695df7..fc8b62e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -833,11 +833,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 833 | 833 | ||
| 834 | m_scene.SwapRootAgentCount(false); | 834 | m_scene.SwapRootAgentCount(false); |
| 835 | 835 | ||
| 836 | CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); | 836 | //CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); |
| 837 | if (userInfo != null) | 837 | //if (userInfo != null) |
| 838 | userInfo.FetchInventory(); | 838 | // userInfo.FetchInventory(); |
| 839 | else | 839 | //else |
| 840 | m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); | 840 | // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); |
| 841 | 841 | ||
| 842 | // On the next prim update, all objects will be sent | 842 | // On the next prim update, all objects will be sent |
| 843 | // | 843 | // |