aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-29 11:03:58 +0000
committerMelanie Thielker2008-08-29 11:03:58 +0000
commitee0a5caa30a3b87a91f3d7032ce92756eec870a7 (patch)
tree35b73dae8cbfd96dcae844160e6cb8e81c5689dc /OpenSim/Region/Environment
parentfixed some ugliness in the conversion from the new mesher format to the old t... (diff)
downloadopensim-SC_OLD-ee0a5caa30a3b87a91f3d7032ce92756eec870a7.zip
opensim-SC_OLD-ee0a5caa30a3b87a91f3d7032ce92756eec870a7.tar.gz
opensim-SC_OLD-ee0a5caa30a3b87a91f3d7032ce92756eec870a7.tar.bz2
opensim-SC_OLD-ee0a5caa30a3b87a91f3d7032ce92756eec870a7.tar.xz
Fix an issue where the client supplies an empty name and it was applied
to the inventory item, causing the item to wind up without a name.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index a12748f..ab580ae 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -538,6 +538,10 @@ namespace OpenSim.Region.Environment.Scenes
538 { 538 {
539 asset.Name = newName; 539 asset.Name = newName;
540 } 540 }
541 else
542 {
543 newName = item.Name;
544 }
541 545
542 if (remoteClient.AgentId == oldAgentID) 546 if (remoteClient.AgentId == oldAgentID)
543 { 547 {