aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMandarinka Tasty2016-12-04 07:10:13 +0100
committerUbitUmarov2016-12-04 17:18:56 +0000
commit7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9 (patch)
treeb065a6dc4641b3d0ff1b805fdcb76bd4a2248518 /OpenSim/Region/ClientStack/Linden
parenta few changes to new GetDisplaynames and friends (diff)
downloadopensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.zip
opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.gz
opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.bz2
opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.xz
The new Constant: integer OBJECT_REZZER_KEY = 32;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs1
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 2481d11..032104d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1046,6 +1046,7 @@ namespace OpenSim.Region.ClientStack.Linden
1046 prim.OwnerID = owner_id; 1046 prim.OwnerID = owner_id;
1047 prim.GroupID = UUID.Zero; 1047 prim.GroupID = UUID.Zero;
1048 prim.LastOwnerID = creatorID; 1048 prim.LastOwnerID = creatorID;
1049 prim.RezzerID = creatorID;
1049 prim.CreationDate = Util.UnixTimeSinceEpoch(); 1050 prim.CreationDate = Util.UnixTimeSinceEpoch();
1050 1051
1051 if (grp == null) 1052 if (grp == null)
@@ -1093,6 +1094,7 @@ namespace OpenSim.Region.ClientStack.Linden
1093 { 1094 {
1094 grp = new SceneObjectGroup(prim); 1095 grp = new SceneObjectGroup(prim);
1095 grp.LastOwnerID = creatorID; 1096 grp.LastOwnerID = creatorID;
1097 grp.RezzerID = creatorID;
1096 } 1098 }
1097 else 1099 else
1098 grp.AddPart(prim); 1100 grp.AddPart(prim);
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 = "";