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

* Removing unnecessary LLUUID.Zero check from AssetCache 

* This revision also includes a very temporary fix for the fact that NREs are received because of a missing avatar apperance in grid mode
0.6.0-stable
Justin Clarke Casey 2008-05-16 16:37:31 +00:00
parent 6a526fcb6f
commit 772f88d2e5
3 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -370,14 +370,11 @@ namespace OpenSim.Framework.Communications.Cache
// See IAssetReceiver // See IAssetReceiver
public void AssetReceived(AssetBase asset, bool IsTexture) public void AssetReceived(AssetBase asset, bool IsTexture)
{
if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server
{ {
//check if it is a texture or not //check if it is a texture or not
//then add to the correct cache list //then add to the correct cache list
//then check for waiting requests for this asset/texture (in the Requested lists) //then check for waiting requests for this asset/texture (in the Requested lists)
//and move those requests into the Requests list. //and move those requests into the Requests list.
if (IsTexture) if (IsTexture)
{ {
TextureImage image = new TextureImage(asset); TextureImage image = new TextureImage(asset);
@ -453,7 +450,6 @@ namespace OpenSim.Framework.Communications.Cache
} }
} }
} }
}
// See IAssetReceiver // See IAssetReceiver
public void AssetNotFound(LLUUID assetID) public void AssetNotFound(LLUUID assetID)

5
OpenSim/Framework/IAssetServer.cs
View File

@ -41,7 +41,10 @@ namespace OpenSim.Framework
void Close(); void Close();
} }
// could change to delegate? /// <summary>
/// Implemented by classes which with to asynchronously receive asset data from the asset service
/// </summary>
/// <remarks>could change to delegate?</remarks>
public interface IAssetReceiver public interface IAssetReceiver
{ {
/// <summary> /// <summary>

5
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -1452,8 +1452,13 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void SendInitialData() public void SendInitialData()
{ {
// justincc - very temporary fix for the fact that m_apperance appears to be null at this point in grid mode
if (null == m_appearance)
m_appearance = new AvatarAppearance();
m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId, m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_uuid, LocalId,
m_pos, m_appearance.Texture.ToBytes(), m_parentID); m_pos, m_appearance.Texture.ToBytes(), m_parentID);
if (!m_isChildAgent) if (!m_isChildAgent)
{ {
m_scene.InformClientOfNeighbours(this); m_scene.InformClientOfNeighbours(this);