Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie
2013-06-23 01:49:45 +01:00
38 changed files with 967 additions and 961 deletions

View File

@@ -326,7 +326,7 @@ namespace OpenSim.Region.Framework.Scenes
// Update item with new asset
item.AssetID = asset.FullID;
if (group.UpdateInventoryItem(item))
remoteClient.SendAgentAlertMessage("Script saved", false);
remoteClient.SendAlertMessage("Script saved");
part.SendPropertiesToClient(remoteClient);
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
remoteClient.SendAgentAlertMessage("Script saved", false);
remoteClient.SendAlertMessage("Script saved");
}
// Tell anyone managing scripts that a script has been reloaded/changed
@@ -1616,11 +1616,11 @@ namespace OpenSim.Region.Framework.Scenes
remoteClient, part, transactionID, currentItem);
if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
remoteClient.SendAgentAlertMessage("Notecard saved", false);
remoteClient.SendAlertMessage("Notecard saved");
else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
remoteClient.SendAgentAlertMessage("Script saved", false);
remoteClient.SendAlertMessage("Script saved");
else
remoteClient.SendAgentAlertMessage("Item saved", false);
remoteClient.SendAlertMessage("Item saved");
}
// Base ALWAYS has move