diff options
| author | John Hurliman | 2010-02-22 14:18:59 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-22 14:18:59 -0800 |
| commit | df76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch) | |
| tree | 74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | |
| parent | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff) | |
| download | opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2 opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz | |
Changed asset CreatorID to a string
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs index 1e03c95..10e5a95 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | |||
| @@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 197 | 197 | ||
| 198 | private void Initialise(UUID fileID, string fileName) | 198 | private void Initialise(UUID fileID, string fileName) |
| 199 | { | 199 | { |
| 200 | m_asset = new AssetBase(fileID, fileName, type, UUID.Zero); | 200 | m_asset = new AssetBase(fileID, fileName, type, UUID.Zero.ToString()); |
| 201 | m_asset.Data = new byte[0]; | 201 | m_asset.Data = new byte[0]; |
| 202 | m_asset.Description = "empty"; | 202 | m_asset.Description = "empty"; |
| 203 | m_asset.Local = true; | 203 | m_asset.Local = true; |
| @@ -212,7 +212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 212 | 212 | ||
| 213 | public void RequestStartXfer(IClientAPI pRemoteClient) | 213 | public void RequestStartXfer(IClientAPI pRemoteClient) |
| 214 | { | 214 | { |
| 215 | m_asset.Metadata.CreatorID = pRemoteClient.AgentId; | 215 | m_asset.Metadata.CreatorID = pRemoteClient.AgentId.ToString(); |
| 216 | 216 | ||
| 217 | if (!String.IsNullOrEmpty(m_asset.Name)) | 217 | if (!String.IsNullOrEmpty(m_asset.Name)) |
| 218 | { | 218 | { |