diff options
| author | UbitUmarov | 2016-12-04 23:39:15 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-04 23:39:15 +0000 |
| commit | 1680425f4d3ddd1c59d99daee23180d985f24d86 (patch) | |
| tree | 56c22c5773ec4663840b1dee0002c9f8dc9d5133 /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |
| parent | update httpserver (diff) | |
| parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
| download | opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.zip opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.gz opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.bz2 opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 769fe28..713125c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
| @@ -284,6 +284,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 284 | prim.OwnerID = AgentId; | 284 | prim.OwnerID = AgentId; |
| 285 | prim.GroupID = obj.GroupID; | 285 | prim.GroupID = obj.GroupID; |
| 286 | prim.LastOwnerID = prim.OwnerID; | 286 | prim.LastOwnerID = prim.OwnerID; |
| 287 | prim.RezzerID = AgentId; | ||
| 287 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | 288 | prim.CreationDate = Util.UnixTimeSinceEpoch(); |
| 288 | prim.Name = obj.Name; | 289 | prim.Name = obj.Name; |
| 289 | prim.Description = ""; | 290 | prim.Description = ""; |