fixing windows specific compile error.

author: Dr Scofield 2009-06-25 08:28:59 +0000
committer: Dr Scofield 2009-06-25 08:28:59 +0000
commit: 74f7b586d33ba9328f646791ccad3903d5498193 (patch)
tree: 562e3af1f1a4c992ae58c74c7ee9b72756a9b4d0
parent: From: Alan Webb <alan_webb@us.ibm.com> (diff)
download: opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.zip
opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.tar.gz
opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.tar.bz2
opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.tar.xz
1 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 2884268..b9ac265 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6819,13 +6819,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    }
                    break;
                case PacketType.UpdateInventoryItem:
-                    UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
+                    UpdateInventoryItemPacket inventoryItemUpdate = (UpdateInventoryItemPacket)Pack;
                    
                    #region Packet Session and User Check
                    if (m_checkPackets)
                    {
-                        if (update.AgentData.SessionID != SessionId ||
+                        if (inventoryItemUpdate.AgentData.SessionID != SessionId ||
-                            update.AgentData.AgentID != AgentId)
+                            inventoryItemUpdate.AgentData.AgentID != AgentId)
                            break;
                    }
                    #endregion
@@ -6833,58 +6833,58 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (OnUpdateInventoryItem != null)
                    {
                        handlerUpdateInventoryItem = null;
-                        for (int i = 0; i < update.InventoryData.Length; i++)
+                        for (int i = 0; i < inventoryItemUpdate.InventoryData.Length; i++)
                        {
                            handlerUpdateInventoryItem = OnUpdateInventoryItem;
                            if (handlerUpdateInventoryItem != null)
                            {
                                InventoryItemBase itemUpd = new InventoryItemBase();
-                                itemUpd.ID = update.InventoryData[i].ItemID;
+                                itemUpd.ID = inventoryItemUpdate.InventoryData[i].ItemID;
-                                itemUpd.Name = Util.FieldToString(update.InventoryData[i].Name);
+                                itemUpd.Name = Util.FieldToString(inventoryItemUpdate.InventoryData[i].Name);
-                                itemUpd.Description = Util.FieldToString(update.InventoryData[i].Description);
+                                itemUpd.Description = Util.FieldToString(inventoryItemUpdate.InventoryData[i].Description);
-                                itemUpd.GroupID = update.InventoryData[i].GroupID;
+                                itemUpd.GroupID = inventoryItemUpdate.InventoryData[i].GroupID;
-                                itemUpd.GroupOwned = update.InventoryData[i].GroupOwned;
+                                itemUpd.GroupOwned = inventoryItemUpdate.InventoryData[i].GroupOwned;
-                                itemUpd.GroupPermissions = update.InventoryData[i].GroupMask;
+                                itemUpd.GroupPermissions = inventoryItemUpdate.InventoryData[i].GroupMask;
-                                itemUpd.NextPermissions = update.InventoryData[i].NextOwnerMask;
+                                itemUpd.NextPermissions = inventoryItemUpdate.InventoryData[i].NextOwnerMask;
-                                itemUpd.EveryOnePermissions = update.InventoryData[i].EveryoneMask;
+                                itemUpd.EveryOnePermissions = inventoryItemUpdate.InventoryData[i].EveryoneMask;
-                                itemUpd.CreationDate = update.InventoryData[i].CreationDate;
+                                itemUpd.CreationDate = inventoryItemUpdate.InventoryData[i].CreationDate;
-                                itemUpd.Folder = update.InventoryData[i].FolderID;
+                                itemUpd.Folder = inventoryItemUpdate.InventoryData[i].FolderID;
-                                itemUpd.InvType = update.InventoryData[i].InvType;
+                                itemUpd.InvType = inventoryItemUpdate.InventoryData[i].InvType;
-                                itemUpd.SalePrice = update.InventoryData[i].SalePrice;
+                                itemUpd.SalePrice = inventoryItemUpdate.InventoryData[i].SalePrice;
-                                itemUpd.SaleType = update.InventoryData[i].SaleType;
+                                itemUpd.SaleType = inventoryItemUpdate.InventoryData[i].SaleType;
-                                itemUpd.Flags = update.InventoryData[i].Flags;
+                                itemUpd.Flags = inventoryItemUpdate.InventoryData[i].Flags;
                                /*
-                                    OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID,
+                                    OnUpdateInventoryItem(this, inventoryItemUpdate.InventoryData[i].TransactionID,
-                                                          update.InventoryData[i].ItemID,
+                                                          inventoryItemUpdate.InventoryData[i].ItemID,
-                                                          Util.FieldToString(update.InventoryData[i].Name),
+                                                          Util.FieldToString(inventoryItemUpdate.InventoryData[i].Name),
-                                                          Util.FieldToString(update.InventoryData[i].Description),
+                                                          Util.FieldToString(inventoryItemUpdate.InventoryData[i].Description),
-                                                          update.InventoryData[i].NextOwnerMask);
+                                                          inventoryItemUpdate.InventoryData[i].NextOwnerMask);
                                    */
-                                OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID,
+                                OnUpdateInventoryItem(this, inventoryItemUpdate.InventoryData[i].TransactionID,
-                                                      update.InventoryData[i].ItemID,
+                                                      inventoryItemUpdate.InventoryData[i].ItemID,
                                                      itemUpd);
                            }
                        }
                    }
                    //m_log.Debug(Pack.ToString());
-                    /*for (int i = 0; i < update.InventoryData.Length; i++)
+                    /*for (int i = 0; i < inventoryItemUpdate.InventoryData.Length; i++)
                        {
-                            if (update.InventoryData[i].TransactionID != UUID.Zero)
+                            if (inventoryItemUpdate.InventoryData[i].TransactionID != UUID.Zero)
                            {
-                                AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId));
+                                AssetBase asset = m_assetCache.GetAsset(inventoryItemUpdate.InventoryData[i].TransactionID.Combine(this.SecureSessionId));
                                if (asset != null)
                                {
                                    // m_log.Debug("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache");
-                                    m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+                                    m_inventoryCache.UpdateInventoryItemAsset(this, inventoryItemUpdate.InventoryData[i].ItemID, asset);
                                }
                                else
                                {
-                                    asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
+                                    asset = this.UploadAssets.AddUploadToAssetCache(inventoryItemUpdate.InventoryData[i].TransactionID);
                                    if (asset != null)
                                    {
                                        //m_log.Debug("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache");
-                                        m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+                                        m_inventoryCache.UpdateInventoryItemAsset(this, inventoryItemUpdate.InventoryData[i].ItemID, asset);
                                    }
                                    else
                                    {
@@ -6894,7 +6894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            }
                            else
                            {
-                                m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
+                                m_inventoryCache.UpdateInventoryItemDetails(this, inventoryItemUpdate.InventoryData[i].ItemID, inventoryItemUpdate.InventoryData[i]); ;
                            }
                        }*/
                    break;
author	Dr Scofield	2009-06-25 08:28:59 +0000
committer	Dr Scofield	2009-06-25 08:28:59 +0000
commit	74f7b586d33ba9328f646791ccad3903d5498193 (patch)
tree	562e3af1f1a4c992ae58c74c7ee9b72756a9b4d0
parent	From: Alan Webb <alan_webb@us.ibm.com> (diff)
download	opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.zip opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.tar.gz opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.tar.bz2 opensim-SC-74f7b586d33ba9328f646791ccad3903d5498193.tar.xz

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2884268..b9ac265 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -6819,13 +6819,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6819	}	6819	}
6820	break;	6820	break;
6821	case PacketType.UpdateInventoryItem:	6821	case PacketType.UpdateInventoryItem:
6822	UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;	6822	UpdateInventoryItemPacket inventoryItemUpdate = (UpdateInventoryItemPacket)Pack;
6823		6823
6824	#region Packet Session and User Check	6824	#region Packet Session and User Check
6825	if (m_checkPackets)	6825	if (m_checkPackets)
6826	{	6826	{
6827	if (update.AgentData.SessionID != SessionId \|\|	6827	if (inventoryItemUpdate.AgentData.SessionID != SessionId \|\|
6828	update.AgentData.AgentID != AgentId)	6828	inventoryItemUpdate.AgentData.AgentID != AgentId)
6829	break;	6829	break;
6830	}	6830	}
6831	#endregion	6831	#endregion
@@ -6833,58 +6833,58 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6833	if (OnUpdateInventoryItem != null)	6833	if (OnUpdateInventoryItem != null)
6834	{	6834	{
6835	handlerUpdateInventoryItem = null;	6835	handlerUpdateInventoryItem = null;
6836	for (int i = 0; i < update.InventoryData.Length; i++)	6836	for (int i = 0; i < inventoryItemUpdate.InventoryData.Length; i++)
6837	{	6837	{
6838	handlerUpdateInventoryItem = OnUpdateInventoryItem;	6838	handlerUpdateInventoryItem = OnUpdateInventoryItem;
6839		6839
6840	if (handlerUpdateInventoryItem != null)	6840	if (handlerUpdateInventoryItem != null)
6841	{	6841	{
6842	InventoryItemBase itemUpd = new InventoryItemBase();	6842	InventoryItemBase itemUpd = new InventoryItemBase();
6843	itemUpd.ID = update.InventoryData[i].ItemID;	6843	itemUpd.ID = inventoryItemUpdate.InventoryData[i].ItemID;
6844	itemUpd.Name = Util.FieldToString(update.InventoryData[i].Name);	6844	itemUpd.Name = Util.FieldToString(inventoryItemUpdate.InventoryData[i].Name);
6845	itemUpd.Description = Util.FieldToString(update.InventoryData[i].Description);	6845	itemUpd.Description = Util.FieldToString(inventoryItemUpdate.InventoryData[i].Description);
6846	itemUpd.GroupID = update.InventoryData[i].GroupID;	6846	itemUpd.GroupID = inventoryItemUpdate.InventoryData[i].GroupID;
6847	itemUpd.GroupOwned = update.InventoryData[i].GroupOwned;	6847	itemUpd.GroupOwned = inventoryItemUpdate.InventoryData[i].GroupOwned;
6848	itemUpd.GroupPermissions = update.InventoryData[i].GroupMask;	6848	itemUpd.GroupPermissions = inventoryItemUpdate.InventoryData[i].GroupMask;
6849	itemUpd.NextPermissions = update.InventoryData[i].NextOwnerMask;	6849	itemUpd.NextPermissions = inventoryItemUpdate.InventoryData[i].NextOwnerMask;
6850	itemUpd.EveryOnePermissions = update.InventoryData[i].EveryoneMask;	6850	itemUpd.EveryOnePermissions = inventoryItemUpdate.InventoryData[i].EveryoneMask;
6851	itemUpd.CreationDate = update.InventoryData[i].CreationDate;	6851	itemUpd.CreationDate = inventoryItemUpdate.InventoryData[i].CreationDate;
6852	itemUpd.Folder = update.InventoryData[i].FolderID;	6852	itemUpd.Folder = inventoryItemUpdate.InventoryData[i].FolderID;
6853	itemUpd.InvType = update.InventoryData[i].InvType;	6853	itemUpd.InvType = inventoryItemUpdate.InventoryData[i].InvType;
6854	itemUpd.SalePrice = update.InventoryData[i].SalePrice;	6854	itemUpd.SalePrice = inventoryItemUpdate.InventoryData[i].SalePrice;
6855	itemUpd.SaleType = update.InventoryData[i].SaleType;	6855	itemUpd.SaleType = inventoryItemUpdate.InventoryData[i].SaleType;
6856	itemUpd.Flags = update.InventoryData[i].Flags;	6856	itemUpd.Flags = inventoryItemUpdate.InventoryData[i].Flags;
6857	/*	6857	/*
6858	OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID,	6858	OnUpdateInventoryItem(this, inventoryItemUpdate.InventoryData[i].TransactionID,
6859	update.InventoryData[i].ItemID,	6859	inventoryItemUpdate.InventoryData[i].ItemID,
6860	Util.FieldToString(update.InventoryData[i].Name),	6860	Util.FieldToString(inventoryItemUpdate.InventoryData[i].Name),
6861	Util.FieldToString(update.InventoryData[i].Description),	6861	Util.FieldToString(inventoryItemUpdate.InventoryData[i].Description),
6862	update.InventoryData[i].NextOwnerMask);	6862	inventoryItemUpdate.InventoryData[i].NextOwnerMask);
6863	*/	6863	*/
6864	OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID,	6864	OnUpdateInventoryItem(this, inventoryItemUpdate.InventoryData[i].TransactionID,
6865	update.InventoryData[i].ItemID,	6865	inventoryItemUpdate.InventoryData[i].ItemID,
6866	itemUpd);	6866	itemUpd);
6867	}	6867	}
6868	}	6868	}
6869	}	6869	}
6870	//m_log.Debug(Pack.ToString());	6870	//m_log.Debug(Pack.ToString());
6871	/*for (int i = 0; i < update.InventoryData.Length; i++)	6871	/*for (int i = 0; i < inventoryItemUpdate.InventoryData.Length; i++)
6872	{	6872	{
6873	if (update.InventoryData[i].TransactionID != UUID.Zero)	6873	if (inventoryItemUpdate.InventoryData[i].TransactionID != UUID.Zero)
6874	{	6874	{
6875	AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId));	6875	AssetBase asset = m_assetCache.GetAsset(inventoryItemUpdate.InventoryData[i].TransactionID.Combine(this.SecureSessionId));
6876	if (asset != null)	6876	if (asset != null)
6877	{	6877	{
6878	// m_log.Debug("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache");	6878	// m_log.Debug("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache");
6879	m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);	6879	m_inventoryCache.UpdateInventoryItemAsset(this, inventoryItemUpdate.InventoryData[i].ItemID, asset);
6880	}	6880	}
6881	else	6881	else
6882	{	6882	{
6883	asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);	6883	asset = this.UploadAssets.AddUploadToAssetCache(inventoryItemUpdate.InventoryData[i].TransactionID);
6884	if (asset != null)	6884	if (asset != null)
6885	{	6885	{
6886	//m_log.Debug("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache");	6886	//m_log.Debug("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache");
6887	m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);	6887	m_inventoryCache.UpdateInventoryItemAsset(this, inventoryItemUpdate.InventoryData[i].ItemID, asset);
6888	}	6888	}
6889	else	6889	else
6890	{	6890	{
@@ -6894,7 +6894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6894	}	6894	}
6895	else	6895	else
6896	{	6896	{
6897	m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;	6897	m_inventoryCache.UpdateInventoryItemDetails(this, inventoryItemUpdate.InventoryData[i].ItemID, inventoryItemUpdate.InventoryData[i]); ;
6898	}	6898	}
6899	}*/	6899	}*/
6900	break;	6900	break;