aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTom Grimshaw2010-06-29 23:19:08 -0700
committerTom Grimshaw2010-06-29 23:19:08 -0700
commit9012084d1192cd98c367c6c9682b69f9d49af069 (patch)
tree27ba292f6915010ea373fc1b6d278c9904ea53db
parentThe other half of the asset fix. Implement an exponentially incrementing retr... (diff)
parentComment the "Notecard saved" notification that pops up when a notecard (diff)
downloadopensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.zip
opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.tar.gz
opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.tar.bz2
opensim-SC_OLD-9012084d1192cd98c367c6c9682b69f9d49af069.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
4 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 4d1de22..990c859 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -1196,7 +1196,7 @@ namespace OpenSim.Framework
1196 prim.Textures = this.Textures; 1196 prim.Textures = this.Textures;
1197 1197
1198 prim.Properties = new Primitive.ObjectProperties(); 1198 prim.Properties = new Primitive.ObjectProperties();
1199 prim.Properties.Name = "Primitive"; 1199 prim.Properties.Name = "Object";
1200 prim.Properties.Description = ""; 1200 prim.Properties.Description = "";
1201 prim.Properties.CreatorID = UUID.Zero; 1201 prim.Properties.CreatorID = UUID.Zero;
1202 prim.Properties.GroupID = UUID.Zero; 1202 prim.Properties.GroupID = UUID.Zero;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 2dc7384..a7aa4ea 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
156 return; 156 return;
157 } 157 }
158 158
159 // Force timestamp to server time to avoid "Saved on" headers
160 // being generated for online users
161 im.timestamp = (uint)Util.UnixTimeSinceEpoch();
162
159 if (dialog == (byte)InstantMessageDialog.MessageFromAgent || 163 if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
160 dialog == (byte)InstantMessageDialog.MessageFromObject) 164 dialog == (byte)InstantMessageDialog.MessageFromObject)
161 { 165 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 6532537..e61132e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.Framework.Scenes
1285 } 1285 }
1286 if (part.Inventory.UpdateInventoryItem(itemInfo)) 1286 if (part.Inventory.UpdateInventoryItem(itemInfo))
1287 { 1287 {
1288 remoteClient.SendAgentAlertMessage("Notecard saved", false); 1288 // remoteClient.SendAgentAlertMessage("Notecard saved", false);
1289 part.GetProperties(remoteClient); 1289 part.GetProperties(remoteClient);
1290 } 1290 }
1291 } 1291 }
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Framework.Scenes
1378 return; 1378 return;
1379 1379
1380 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, 1380 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
1381 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), 1381 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),
1382 remoteClient.AgentId); 1382 remoteClient.AgentId);
1383 AssetService.Store(asset); 1383 AssetService.Store(asset);
1384 1384
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 09c945b..5b007e6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes
358 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 358 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
359 Quaternion rotationOffset, Vector3 offsetPosition) 359 Quaternion rotationOffset, Vector3 offsetPosition)
360 { 360 {
361 m_name = "Primitive"; 361 m_name = "Object";
362 362
363 Rezzed = DateTime.UtcNow; 363 Rezzed = DateTime.UtcNow;
364 _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed); 364 _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
@@ -1625,7 +1625,7 @@ namespace OpenSim.Region.Framework.Scenes
1625 PrimitiveBaseShape shape = PrimitiveBaseShape.Create(); 1625 PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
1626 part.Shape = shape; 1626 part.Shape = shape;
1627 1627
1628 part.Name = "Primitive"; 1628 part.Name = "Object";
1629 part._ownerID = UUID.Random(); 1629 part._ownerID = UUID.Random();
1630 1630
1631 return part; 1631 return part;