OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i can haz pantz? 

You sure can.  This change set restores pants (and the rest of the
default appearance) in grid mode.  The 
root issue had to do with serializing multi-faced textures to the 
grid server.  This also restores the lookup path through the avatar
factory module, as that seems the reasonable place to have it live.
Some clean up patches are coming later as well, plus testing on 
standalone, but this should be in a good kicking around state for 
grid users.
0.6.0-stable
Sean Dague 2008-05-19 19:08:59 +00:00
parent 4b622ec881
commit 9808f39b6f
6 changed files with 125 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -661,9 +661,7 @@ namespace OpenSim.Data.MySQL
AvatarAppearance appearance = null;
if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance))
{
appearance = new AvatarAppearance();
appearance.Owner = user;
UpdateUserAppearance(user, appearance);
appearance = null;
}
return appearance;
}

7
OpenSim/Data/UserDataBase.cs
View File

@ -60,15 +60,12 @@ namespace OpenSim.Data
public abstract void Initialise(string connect);
public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
public AvatarAppearance GetUserAppearance(LLUUID user) {
AvatarAppearance aa;
AvatarAppearance aa = null;
try {
aa = aplist[user];
m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
} catch (System.Collections.Generic.KeyNotFoundException e) {
aplist[user] = new AvatarAppearance();
aplist[user].Owner = user;
aa = aplist[user];
m_log.Info("[APPEARANCE] Setting up default appearance for " + user.ToString() + aa.ToString());
m_log.Info("[APPEARANCE] No appearance found for " + user.ToString());
}
return aa;
}

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -611,7 +611,7 @@ namespace OpenSim.Framework.Communications
m_log.InfoFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Key, e.ToString());
}
}
return new AvatarAppearance();
return null;
}
public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)

6
OpenSim/Grid/UserServer/UserManager.cs
View File

@ -256,8 +256,14 @@ namespace OpenSim.Grid.UserServer
if (requestData.Contains("owner"))
{
appearance = GetUserAppearance(new LLUUID((string)requestData["owner"]));
if (appearance == null) {
responseData = new Hashtable();
responseData["error_type"] = "no appearance";
responseData["error_desc"] = "There was no appearance found for this avatar";
} else {
responseData = appearance.ToHashTable();
}
}
else
{
responseData = new Hashtable();

29
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1780,28 +1780,27 @@ namespace OpenSim.Region.Environment.Scenes
protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
{
AvatarAppearance appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
AvatarAppearance appearance = null;
GetAvatarAppearance(client, out appearance);
ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
return avatar;
}
// protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance)
// {
// appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance)
{
appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
// // if (m_AvatarFactory == null ||
// // !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
// // {
// // //not found Appearance
// // m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis");
// // byte[] visualParams;
// // AvatarWearable[] wearables;
// // GetDefaultAvatarAppearance(out wearables, out visualParams);
// // appearance = new AvatarAppearance(client.AgentId, wearables, visualParams);
// // }
// }
if (m_AvatarFactory == null ||
!m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
{
// not found Appearance
m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis");
appearance = new AvatarAppearance();
}
}
/// <summary>
/// Remove the given client from the scene.

198
OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
View File

@ -59,112 +59,114 @@ namespace OpenSim.Region.Modules.AvatarFactory
public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance)
{
//should only let one thread at a time do this part
EventWaitHandle waitHandle = null;
bool fetchInProgress = false;
lock (m_syncLock)
{
appearance = CheckCache(avatarId);
if (appearance != null)
{
appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId);
return true;
}
//not in cache so check to see if another thread is already fetching it
if (m_fetchesInProgress.TryGetValue(avatarId, out waitHandle))
{
fetchInProgress = true;
}
else
{
fetchInProgress = false;
// //should only let one thread at a time do this part
// EventWaitHandle waitHandle = null;
// bool fetchInProgress = false;
// lock (m_syncLock)
// {
// appearance = CheckCache(avatarId);
// if (appearance != null)
// {
// return true;
// }
//no thread already fetching this appearance, so add a wait handle to list
//for any following threads that want the same appearance
waitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
m_fetchesInProgress.Add(avatarId, waitHandle);
}
}
// //not in cache so check to see if another thread is already fetching it
// if (m_fetchesInProgress.TryGetValue(avatarId, out waitHandle))
// {
// fetchInProgress = true;
// }
// else
// {
// fetchInProgress = false;
if (fetchInProgress)
{
waitHandle.WaitOne();
appearance = CheckCache(avatarId);
if (appearance != null)
{
waitHandle = null;
return true;
}
else
{
waitHandle = null;
return false;
}
}
else
{
// BUG: !? (Reduced from 5000 to 500 by Adam)
Thread.Sleep(500); //why is this here?
// //no thread already fetching this appearance, so add a wait handle to list
// //for any following threads that want the same appearance
// waitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
// m_fetchesInProgress.Add(avatarId, waitHandle);
// }
// }
//this is the first thread to request this appearance
//so let it check the db and if not found then create a default appearance
//and add that to the cache
appearance = CheckDatabase(avatarId);
if (appearance != null)
{
//appearance has now been added to cache so lets pulse any waiting threads
lock (m_syncLock)
{
m_fetchesInProgress.Remove(avatarId);
waitHandle.Set();
}
// waitHandle.Close();
waitHandle = null;
return true;
}
// if (fetchInProgress)
// {
// waitHandle.WaitOne();
// appearance = CheckCache(avatarId);
// if (appearance != null)
// {
// waitHandle = null;
// return true;
// }
// else
// {
// waitHandle = null;
// return false;
// }
// }
// else
// {
// // BUG: !? (Reduced from 5000 to 500 by Adam)
// Thread.Sleep(500); //why is this here?
//not found a appearance for the user, so create a new default one
appearance = CreateDefault(avatarId);
if (appearance != null)
{
//update database
if (m_enablePersist)
{
m_appearanceMapper.Add(avatarId.UUID, appearance);
}
// //this is the first thread to request this appearance
// //so let it check the db and if not found then create a default appearance
// //and add that to the cache
// appearance = CheckDatabase(avatarId);
// if (appearance != null)
// {
// //appearance has now been added to cache so lets pulse any waiting threads
// lock (m_syncLock)
// {
// m_fetchesInProgress.Remove(avatarId);
// waitHandle.Set();
// }
// // waitHandle.Close();
// waitHandle = null;
// return true;
// }
//add appearance to dictionary cache
lock (m_avatarsAppearance)
{
m_avatarsAppearance[avatarId] = appearance;
}
// //not found a appearance for the user, so create a new default one
// appearance = CreateDefault(avatarId);
// if (appearance != null)
// {
// //update database
// if (m_enablePersist)
// {
// m_appearanceMapper.Add(avatarId.UUID, appearance);
// }
//appearance has now been added to cache so lets pulse any waiting threads
lock (m_syncLock)
{
m_fetchesInProgress.Remove(avatarId);
waitHandle.Set();
}
// waitHandle.Close();
waitHandle = null;
return true;
}
else
{
//something went wrong, so release the wait handle and remove it
//all waiting threads will fail to find cached appearance
//but its better for them to fail than wait for ever
lock (m_syncLock)
{
m_fetchesInProgress.Remove(avatarId);
waitHandle.Set();
}
//waitHandle.Close();
waitHandle = null;
return false;
}
}
// //add appearance to dictionary cache
// lock (m_avatarsAppearance)
// {
// m_avatarsAppearance[avatarId] = appearance;
// }
// //appearance has now been added to cache so lets pulse any waiting threads
// lock (m_syncLock)
// {
// m_fetchesInProgress.Remove(avatarId);
// waitHandle.Set();
// }
// // waitHandle.Close();
// waitHandle = null;
// return true;
// }
// else
// {
// //something went wrong, so release the wait handle and remove it
// //all waiting threads will fail to find cached appearance
// //but its better for them to fail than wait for ever
// lock (m_syncLock)
// {
// m_fetchesInProgress.Remove(avatarId);
// waitHandle.Set();
// }
// //waitHandle.Close();
// waitHandle = null;
// return false;
// }
// }
}
private AvatarAppearance CreateDefault(LLUUID avatarId)