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

Merge branch 'avination-current' into ubitwork

avinationmerge
UbitUmarov 2013-05-31 23:18:12 +01:00
parent 4709436a6c 9589a09eda
commit 8fe2308afc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
View File

@ -97,7 +97,7 @@ namespace OpenSim.Capabilities.Handlers
llsdItem.asset_id = invItem.AssetID; llsdItem.asset_id = invItem.AssetID;
llsdItem.created_at = invItem.CreationDate; llsdItem.created_at = invItem.CreationDate;
llsdItem.desc = invItem.Description; llsdItem.desc = invItem.Description;
llsdItem.flags = (int)invItem.Flags; llsdItem.flags = ((int)invItem.Flags) & 0xff;
llsdItem.item_id = invItem.ID; llsdItem.item_id = invItem.ID;
llsdItem.name = invItem.Name; llsdItem.name = invItem.Name;
llsdItem.parent_id = invItem.Folder; llsdItem.parent_id = invItem.Folder;

2
OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
View File

@ -411,7 +411,7 @@ namespace OpenSim.Capabilities.Handlers
llsdItem.asset_id = invItem.AssetID; llsdItem.asset_id = invItem.AssetID;
llsdItem.created_at = invItem.CreationDate; llsdItem.created_at = invItem.CreationDate;
llsdItem.desc = invItem.Description; llsdItem.desc = invItem.Description;
llsdItem.flags = (int)invItem.Flags; llsdItem.flags = ((int)invItem.Flags) & 0xff;
llsdItem.item_id = invItem.ID; llsdItem.item_id = invItem.ID;
llsdItem.name = invItem.Name; llsdItem.name = invItem.Name;
llsdItem.parent_id = invItem.Folder; llsdItem.parent_id = invItem.Folder;

8
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1737,7 +1737,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newBlock.CreationDate = item.CreationDate; newBlock.CreationDate = item.CreationDate;
newBlock.SalePrice = item.SalePrice; newBlock.SalePrice = item.SalePrice;
newBlock.SaleType = item.SaleType; newBlock.SaleType = item.SaleType;
newBlock.Flags = item.Flags; newBlock.Flags = item.Flags & 0xff;
newBlock.CRC = newBlock.CRC =
Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType, Helpers.InventoryCRC(newBlock.CreationDate, newBlock.SaleType,
@ -1991,7 +1991,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
itemBlock.GroupID = item.GroupID; itemBlock.GroupID = item.GroupID;
itemBlock.GroupOwned = item.GroupOwned; itemBlock.GroupOwned = item.GroupOwned;
itemBlock.GroupMask = item.GroupPermissions; itemBlock.GroupMask = item.GroupPermissions;
itemBlock.Flags = item.Flags; itemBlock.Flags = item.Flags & 0xff;
itemBlock.SalePrice = item.SalePrice; itemBlock.SalePrice = item.SalePrice;
itemBlock.SaleType = item.SaleType; itemBlock.SaleType = item.SaleType;
itemBlock.CreationDate = item.CreationDate; itemBlock.CreationDate = item.CreationDate;
@ -2058,7 +2058,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bulkUpdate.ItemData[0].GroupID = item.GroupID; bulkUpdate.ItemData[0].GroupID = item.GroupID;
bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned; bulkUpdate.ItemData[0].GroupOwned = item.GroupOwned;
bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions; bulkUpdate.ItemData[0].GroupMask = item.GroupPermissions;
bulkUpdate.ItemData[0].Flags = item.Flags; bulkUpdate.ItemData[0].Flags = item.Flags & 0xff;
bulkUpdate.ItemData[0].SalePrice = item.SalePrice; bulkUpdate.ItemData[0].SalePrice = item.SalePrice;
bulkUpdate.ItemData[0].SaleType = item.SaleType; bulkUpdate.ItemData[0].SaleType = item.SaleType;
@ -2112,7 +2112,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
InventoryReply.InventoryData[0].GroupID = Item.GroupID; InventoryReply.InventoryData[0].GroupID = Item.GroupID;
InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned; InventoryReply.InventoryData[0].GroupOwned = Item.GroupOwned;
InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions; InventoryReply.InventoryData[0].GroupMask = Item.GroupPermissions;
InventoryReply.InventoryData[0].Flags = Item.Flags; InventoryReply.InventoryData[0].Flags = Item.Flags & 0xff;
InventoryReply.InventoryData[0].SalePrice = Item.SalePrice; InventoryReply.InventoryData[0].SalePrice = Item.SalePrice;
InventoryReply.InventoryData[0].SaleType = Item.SaleType; InventoryReply.InventoryData[0].SaleType = Item.SaleType;
InventoryReply.InventoryData[0].CreationDate = Item.CreationDate; InventoryReply.InventoryData[0].CreationDate = Item.CreationDate;

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

@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
m_nextPosition = m_group.AbsolutePosition + motionThisFrame; m_nextPosition = m_group.AbsolutePosition + motionThisFrame;
m_group.AbsolutePosition = m_nextPosition; m_group.AbsolutePosition = m_nextPosition;
m_group.RootPart.Velocity = v; //m_group.RootPart.Velocity = v;
update = true; update = true;
} }