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

Fixed a couple of bugs with Appearance. Appearance is all good now.

slimupdates
Diva Canto 2010-01-11 17:30:05 -08:00
parent 4e7c449c5a
commit 77e43f4801
16 changed files with 124 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -1397,7 +1397,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
AvatarAppearance ava = null;
AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca);
if (avatar != null)
ava = avatar.ToAvatarAppearance();
ava = avatar.ToAvatarAppearance(srca);
// If the model has no associated appearance we're done.
@ -1639,7 +1639,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
// While the inventory is being fetched, setup for appearance processing
AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID);
if (adata != null)
mava = adata.ToAvatarAppearance();
mava = adata.ToAvatarAppearance(ID);
else
mava = new AvatarAppearance();

4
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@ -304,7 +304,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
String.Format("appearance data not found for user {0} {1}",
rdata.userProfile.FirstName, rdata.userProfile.SurName));
}
rdata.userAppearance = adata.ToAvatarAppearance();
rdata.userAppearance = adata.ToAvatarAppearance(rdata.userProfile.ID);
rdata.initXmlWriter();
@ -446,7 +446,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (adata != null)
{
AvatarAppearance old = adata.ToAvatarAppearance();
AvatarAppearance old = adata.ToAvatarAppearance(rdata.userProfile.ID);
rdata.userAppearance = new AvatarAppearance();
rdata.userAppearance.Owner = old.Owner;
adata = new AvatarData(rdata.userAppearance);

2
OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
View File

@ -536,7 +536,7 @@ namespace OpenSim.Client.MXP.PacketHandler
agent.CapsPath = "http://localhost/";
AvatarData avatar = scene.AvatarService.GetAvatar(account.PrincipalID);
if (avatar != null)
agent.Appearance = avatar.ToAvatarAppearance(); //userService.GetUserAppearance(userProfile.ID);
agent.Appearance = avatar.ToAvatarAppearance(account.PrincipalID); //userService.GetUserAppearance(userProfile.ID);
if (agent.Appearance == null)
{

1
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -197,7 +197,6 @@ namespace OpenSim
LoadPlugins();
foreach (IApplicationPlugin plugin in m_plugins)
{
m_log.Debug("XXX PostInitialise " + plugin.Name);
plugin.PostInitialise();
}

1
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -5474,6 +5474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// for the client session anyway, in order to protect ourselves against bad code in plugins
try
{
byte[] visualparams = new byte[appear.VisualParam.Length];
for (int i = 0; i < appear.VisualParam.Length; i++)
visualparams[i] = appear.VisualParam[i].ParamValue;

17
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
//if ((profile != null) && (profile.RootFolder != null))
if (avatar != null)
{
appearance = avatar.ToAvatarAppearance();
appearance = avatar.ToAvatarAppearance(avatarId);
return true;
}
@ -153,6 +153,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
/// <param name="e"></param>
public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
{
m_log.DebugFormat("[APPEARANCE]: AvatarIsWearing");
IClientAPI clientView = (IClientAPI)sender;
ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId);
@ -162,12 +164,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
return;
}
AvatarAppearance avatAppearance = null;
if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
{
m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
avatAppearance = sp.Appearance;
}
AvatarAppearance avatAppearance = sp.Appearance;
//if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
//{
// m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
// avatAppearance = sp.Appearance;
//}
//m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
@ -194,6 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public void UpdateDatabase(UUID user, AvatarAppearance appearance)
{
m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
AvatarData adata = new AvatarData(appearance);
m_scene.AvatarService.SetAvatar(user, adata);

10
OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
View File

@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
IConfig userConfig = source.Configs["AvatarService"];
if (userConfig == null)
{
m_log.Error("[USER CONNECTOR]: AvatarService missing from OpenSim.ini");
m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
return;
}
@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
if (serviceDll == String.Empty)
{
m_log.Error("[USER CONNECTOR]: No LocalServiceModule named in section AvatarService");
m_log.Error("[AVATAR CONNECTOR]: No LocalServiceModule named in section AvatarService");
return;
}
@ -92,11 +92,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
if (m_AvatarService == null)
{
m_log.Error("[USER CONNECTOR]: Can't load user account service");
m_log.Error("[AVATAR CONNECTOR]: Can't load user account service");
return;
}
m_Enabled = true;
m_log.Info("[USER CONNECTOR]: Local avatar connector enabled");
m_log.Info("[AVATAR CONNECTOR]: Local avatar connector enabled");
}
}
}
@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
if (!m_Enabled)
return;
scene.RegisterModuleInterface<IAvatarService>(m_AvatarService);
scene.RegisterModuleInterface<IAvatarService>(this);
}
public void RemoveRegion(Scene scene)

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2358,7 +2358,7 @@ namespace OpenSim.Region.Framework.Scenes
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
}
return att.UUID;
}
@ -2403,7 +2403,7 @@ namespace OpenSim.Region.Framework.Scenes
// XXYY!!
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, /*item.AssetID*/ att.UUID);
if (m_AvatarFactory != null)
{

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
get
{
if (m_AvatarService == null)
m_AvatarService = RequestModuleInterface<OpenSim.Services.Interfaces.IAvatarService>();
m_AvatarService = RequestModuleInterface<IAvatarService>();
return m_AvatarService;
}
}

4
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -250,7 +250,7 @@ namespace OpenSim.Region.Framework.Scenes
{
InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate) iar.AsyncState;
icon.EndInvoke(iar);
m_log.WarnFormat(" --> InformClientOfNeighbourCompleted");
//m_log.WarnFormat(" --> InformClientOfNeighbourCompleted");
}
/// <summary>
@ -456,7 +456,7 @@ namespace OpenSim.Region.Framework.Scenes
int count = 0;
foreach (GridRegion neighbour in neighbours)
{
m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
//m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
// Don't do it if there's already an agent in that region
if (newRegions.Contains(neighbour.RegionHandle))
newAgent = true;

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2565,14 +2565,18 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
}
#endregion Bake Cache Check
m_appearance.SetAppearance(textureEntry, visualParams);
if (m_appearance.AvatarHeight > 0)
SetHeight(m_appearance.AvatarHeight);
AvatarData adata = new AvatarData(m_appearance);
m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
SendAppearanceToAllOtherAgents();

2
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
AvatarData adata = scene.AvatarService.GetAvatar(target);
if (adata != null)
{
AvatarAppearance x = adata.ToAvatarAppearance();
AvatarAppearance x = adata.ToAvatarAppearance(target);
m_appearanceCache.Add(target, x);

6
OpenSim/Services/AvatarService/AvatarService.cs
View File

@ -73,6 +73,12 @@ namespace OpenSim.Services.AvatarService
public bool SetAvatar(UUID principalID, AvatarData avatar)
{
int count = 0;
foreach (KeyValuePair<string, string> kvp in avatar.Data)
if (kvp.Key.StartsWith("_"))
count++;
m_log.DebugFormat("[AVATAR SERVICE]: SetAvatar for {0}, attachs={1}", principalID, count);
m_Database.Delete("PrincipalID", principalID.ToString());
AvatarBaseData av = new AvatarBaseData();

123
OpenSim/Services/Interfaces/IAvatarService.cs
View File

@ -131,17 +131,15 @@ namespace OpenSim.Services.Interfaces
AvatarType = 1; // SL avatars
Data = new Dictionary<string, string>();
Data["Serial"] = appearance.Serial.ToString();
// Wearables
Data["AvatarHeight"] = appearance.AvatarHeight.ToString();
Data["BodyItem"] = appearance.BodyItem.ToString();
Data["EyesItem"] = appearance.EyesItem.ToString();
Data["GlovesItem"] = appearance.GlovesItem.ToString();
Data["HairItem"] = appearance.HairItem.ToString();
//Data["HipOffset"] = appearance.HipOffset.ToString();
Data["JacketItem"] = appearance.JacketItem.ToString();
Data["Owner"] = appearance.Owner.ToString();
Data["PantsItem"] = appearance.PantsItem.ToString();
Data["Serial"] = appearance.Serial.ToString();
Data["ShirtItem"] = appearance.ShirtItem.ToString();
Data["ShoesItem"] = appearance.ShoesItem.ToString();
Data["SkinItem"] = appearance.SkinItem.ToString();
@ -150,53 +148,92 @@ namespace OpenSim.Services.Interfaces
Data["UnderPantsItem"] = appearance.UnderPantsItem.ToString();
Data["UnderShirtItem"] = appearance.UnderShirtItem.ToString();
Data["BodyAsset"] = appearance.BodyAsset.ToString();
Data["EyesAsset"] = appearance.EyesAsset.ToString();
Data["GlovesAsset"] = appearance.GlovesAsset.ToString();
Data["HairAsset"] = appearance.HairAsset.ToString();
Data["JacketAsset"] = appearance.JacketAsset.ToString();
Data["PantsAsset"] = appearance.PantsAsset.ToString();
Data["ShirtAsset"] = appearance.ShirtAsset.ToString();
Data["ShoesAsset"] = appearance.ShoesAsset.ToString();
Data["SkinAsset"] = appearance.SkinAsset.ToString();
Data["SkirtAsset"] = appearance.SkirtAsset.ToString();
Data["SocksAsset"] = appearance.SocksAsset.ToString();
Data["UnderPantsAsset"] = appearance.UnderPantsAsset.ToString();
Data["UnderShirtAsset"] = appearance.UnderShirtAsset.ToString();
// Attachments
Hashtable attachs = appearance.GetAttachments();
foreach (KeyValuePair<int, Hashtable> kvp in attachs)
{
Data["_ap_" + kvp.Key] = kvp.Value["item"].ToString();
}
if (attachs != null)
foreach (DictionaryEntry dentry in attachs)
{
if (dentry.Value != null)
{
Hashtable tab = (Hashtable)dentry.Value;
if (tab.ContainsKey("item") && tab["item"] != null)
Data["_ap_" + dentry.Key] = tab["item"].ToString();
}
}
}
public AvatarAppearance ToAvatarAppearance()
public AvatarAppearance ToAvatarAppearance(UUID owner)
{
AvatarAppearance appearance = new AvatarAppearance();
// Wearables
appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
appearance.BodyItem = UUID.Parse(Data["BodyItem"]);
appearance.EyesItem = UUID.Parse(Data["EyesItem"]);
appearance.GlovesItem = UUID.Parse(Data["GlovesItem"]);
appearance.HairItem = UUID.Parse(Data["HairItem"]);
//appearance.HipOffset = float.Parse(Data["HipOffset"]);
appearance.JacketItem = UUID.Parse(Data["JacketItem"]);
appearance.Owner = UUID.Parse(Data["Owner"]);
appearance.PantsItem = UUID.Parse(Data["PantsItem"]);
appearance.Serial = Int32.Parse(Data["Serial"]);
appearance.ShirtItem = UUID.Parse(Data["ShirtItem"]);
appearance.ShoesItem = UUID.Parse(Data["ShoesItem"]);
appearance.SkinItem = UUID.Parse(Data["SkinItem"]);
appearance.SkirtItem = UUID.Parse(Data["SkirtItem"]);
appearance.SocksItem = UUID.Parse(Data["SocksItem"]);
appearance.UnderPantsItem = UUID.Parse(Data["UnderPantsItem"]);
appearance.UnderShirtItem = UUID.Parse(Data["UnderShirtItem"]);
// Attachments
Dictionary<string, string> attchs = new Dictionary<string, string>();
foreach (KeyValuePair<string, string> _kvp in Data)
if (_kvp.Key.StartsWith("_ap_"))
attchs[_kvp.Key] = _kvp.Value;
Hashtable aaAttachs = new Hashtable();
foreach (KeyValuePair<string, string> _kvp in attchs)
AvatarAppearance appearance = new AvatarAppearance(owner);
try
{
string pointStr = _kvp.Key.Substring(4);
int point = 0;
if (!Int32.TryParse(pointStr, out point))
continue;
Hashtable tmp = new Hashtable();
tmp["item"] = _kvp.Value;
tmp["asset"] = UUID.Zero.ToString();
aaAttachs[point] = tmp;
appearance.Serial = Int32.Parse(Data["Serial"]);
// Wearables
appearance.BodyItem = UUID.Parse(Data["BodyItem"]);
appearance.EyesItem = UUID.Parse(Data["EyesItem"]);
appearance.GlovesItem = UUID.Parse(Data["GlovesItem"]);
appearance.HairItem = UUID.Parse(Data["HairItem"]);
appearance.JacketItem = UUID.Parse(Data["JacketItem"]);
appearance.PantsItem = UUID.Parse(Data["PantsItem"]);
appearance.ShirtItem = UUID.Parse(Data["ShirtItem"]);
appearance.ShoesItem = UUID.Parse(Data["ShoesItem"]);
appearance.SkinItem = UUID.Parse(Data["SkinItem"]);
appearance.SkirtItem = UUID.Parse(Data["SkirtItem"]);
appearance.SocksItem = UUID.Parse(Data["SocksItem"]);
appearance.UnderPantsItem = UUID.Parse(Data["UnderPantsItem"]);
appearance.UnderShirtItem = UUID.Parse(Data["UnderShirtItem"]);
appearance.BodyAsset = UUID.Parse(Data["BodyAsset"]);
appearance.EyesAsset = UUID.Parse(Data["EyesAsset"]);
appearance.GlovesAsset = UUID.Parse(Data["GlovesAsset"]);
appearance.HairAsset = UUID.Parse(Data["HairAsset"]);
appearance.JacketAsset = UUID.Parse(Data["JacketAsset"]);
appearance.PantsAsset = UUID.Parse(Data["PantsAsset"]);
appearance.ShirtAsset = UUID.Parse(Data["ShirtAsset"]);
appearance.ShoesAsset = UUID.Parse(Data["ShoesAsset"]);
appearance.SkinAsset = UUID.Parse(Data["SkinAsset"]);
appearance.SkirtAsset = UUID.Parse(Data["SkirtAsset"]);
appearance.SocksAsset = UUID.Parse(Data["SocksAsset"]);
appearance.UnderPantsAsset = UUID.Parse(Data["UnderPantsAsset"]);
appearance.UnderShirtAsset = UUID.Parse(Data["UnderShirtAsset"]);
// Attachments
Dictionary<string, string> attchs = new Dictionary<string, string>();
foreach (KeyValuePair<string, string> _kvp in Data)
if (_kvp.Key.StartsWith("_ap_"))
attchs[_kvp.Key] = _kvp.Value;
Hashtable aaAttachs = new Hashtable();
foreach (KeyValuePair<string, string> _kvp in attchs)
{
string pointStr = _kvp.Key.Substring(4);
int point = 0;
if (!Int32.TryParse(pointStr, out point))
continue;
Hashtable tmp = new Hashtable();
UUID uuid = UUID.Zero;
UUID.TryParse(_kvp.Value, out uuid);
tmp["item"] = uuid;
tmp["asset"] = UUID.Zero.ToString();
aaAttachs[point] = tmp;
}
appearance.SetAttachments(aaAttachs);
}
catch { }
return appearance;
}

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -375,7 +375,7 @@ namespace OpenSim.Services.LLLoginService
aCircuit.AgentID = account.PrincipalID;
if (avatar != null)
aCircuit.Appearance = avatar.ToAvatarAppearance();
aCircuit.Appearance = avatar.ToAvatarAppearance(account.PrincipalID);
//aCircuit.BaseFolder = irrelevant
aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
aCircuit.child = false; // the first login agent is root

6
bin/config-include/StandaloneHypergrid.ini
View File

@ -20,6 +20,7 @@
PresenceServices = "LocalPresenceServicesConnector"
UserAccountServices = "LocalUserAccountServicesConnector"
SimulationServices = "RemoteSimulationConnectorModule"
AvatarServices = "LocalAvatarServicesConnector";
InventoryServiceInConnector = true
AssetServiceInConnector = true
HGAuthServiceInConnector = true
@ -44,6 +45,10 @@
LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
[AvatarService]
; For the InventoryServiceInConnector
LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
[LibraryService]
LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
LibraryName = "OpenSim Library"
@ -79,6 +84,7 @@
InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
GridService = "OpenSim.Services.GridService.dll:GridService"
AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
DefaultRegion = "OpenSim Test"
WelcomeMessage = "Welcome, Avatar!"