diff options
author | John Hurliman | 2009-11-04 16:08:23 -0800 |
---|---|---|
committer | John Hurliman | 2009-11-04 16:08:23 -0800 |
commit | f57a646638340063e22d1f38c37502afaf963137 (patch) | |
tree | ea109f74119cf552805c601bd13d3a2a697cd9a5 /OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | |
parent | Removing EntityBase.Rotation (diff) | |
parent | Add some length to the backet buffer for packet sending so oversize (diff) | |
download | opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.zip opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.gz opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.bz2 opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs index 244ac3b..7a66d23 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | |||
@@ -77,13 +77,13 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
77 | 77 | ||
78 | #region Internal functions | 78 | #region Internal functions |
79 | 79 | ||
80 | private string UserAssetURL(UUID userID) | 80 | // private string UserAssetURL(UUID userID) |
81 | { | 81 | // { |
82 | CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID); | 82 | // CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID); |
83 | if (uinfo != null) | 83 | // if (uinfo != null) |
84 | return (uinfo.UserProfile.UserAssetURI == "") ? null : uinfo.UserProfile.UserAssetURI; | 84 | // return (uinfo.UserProfile.UserAssetURI == "") ? null : uinfo.UserProfile.UserAssetURI; |
85 | return null; | 85 | // return null; |
86 | } | 86 | // } |
87 | 87 | ||
88 | // private string UserInventoryURL(UUID userID) | 88 | // private string UserInventoryURL(UUID userID) |
89 | // { | 89 | // { |