diff options
author | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-09 17:36:28 +0000 |
commit | 7f5d0a6735585d47e081cb0b717de46d5e23260d (patch) | |
tree | d463176be6e07c4bb6948f428958fe7452866758 /OpenSim/ApplicationPlugins/RemoteController | |
parent | refactor out iar escaping (diff) | |
parent | remove the debug stuff (diff) | |
download | opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.zip opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.gz opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.bz2 opensim-SC-7f5d0a6735585d47e081cb0b717de46d5e23260d.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 3c7727f..3149eaa 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1562,11 +1562,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1562 | assets = doc.GetElementsByTagName("RequiredAsset"); | 1562 | assets = doc.GetElementsByTagName("RequiredAsset"); |
1563 | foreach (XmlNode asset in assets) | 1563 | foreach (XmlNode asset in assets) |
1564 | { | 1564 | { |
1565 | AssetBase rass = new AssetBase(); | 1565 | AssetBase rass = new AssetBase(UUID.Random(), GetStringAttribute(asset,"name",""), SByte.Parse(GetStringAttribute(asset,"type",""))); |
1566 | rass.FullID = UUID.Random(); | ||
1567 | rass.Name = GetStringAttribute(asset,"name",""); | ||
1568 | rass.Description = GetStringAttribute(asset,"desc",""); | 1566 | rass.Description = GetStringAttribute(asset,"desc",""); |
1569 | rass.Type = SByte.Parse(GetStringAttribute(asset,"type","")); | ||
1570 | rass.Local = Boolean.Parse(GetStringAttribute(asset,"local","")); | 1567 | rass.Local = Boolean.Parse(GetStringAttribute(asset,"local","")); |
1571 | rass.Temporary = Boolean.Parse(GetStringAttribute(asset,"temporary","")); | 1568 | rass.Temporary = Boolean.Parse(GetStringAttribute(asset,"temporary","")); |
1572 | rass.Data = Convert.FromBase64String(asset.InnerText); | 1569 | rass.Data = Convert.FromBase64String(asset.InnerText); |