OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Tom Grimshaw 2010-06-29 23:19:08 -07:00
parent 8dc7c0849e 3cd717d929
commit 9012084d11
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -1196,7 +1196,7 @@ namespace OpenSim.Framework
prim.Textures = this.Textures; prim.Textures = this.Textures;
prim.Properties = new Primitive.ObjectProperties(); prim.Properties = new Primitive.ObjectProperties();
prim.Properties.Name = "Primitive"; prim.Properties.Name = "Object";
prim.Properties.Description = ""; prim.Properties.Description = "";
prim.Properties.CreatorID = UUID.Zero; prim.Properties.CreatorID = UUID.Zero;
prim.Properties.GroupID = UUID.Zero; prim.Properties.GroupID = UUID.Zero;

4
OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@ -156,6 +156,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return; return;
} }
// Force timestamp to server time to avoid "Saved on" headers
// being generated for online users
im.timestamp = (uint)Util.UnixTimeSinceEpoch();
if (dialog == (byte)InstantMessageDialog.MessageFromAgent || if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
dialog == (byte)InstantMessageDialog.MessageFromObject) dialog == (byte)InstantMessageDialog.MessageFromObject)
{ {

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1285,7 +1285,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
if (part.Inventory.UpdateInventoryItem(itemInfo)) if (part.Inventory.UpdateInventoryItem(itemInfo))
{ {
remoteClient.SendAgentAlertMessage("Notecard saved", false); // remoteClient.SendAgentAlertMessage("Notecard saved", false);
part.GetProperties(remoteClient); part.GetProperties(remoteClient);
} }
} }
@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),
remoteClient.AgentId); remoteClient.AgentId);
AssetService.Store(asset); AssetService.Store(asset);

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes
UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
Quaternion rotationOffset, Vector3 offsetPosition) Quaternion rotationOffset, Vector3 offsetPosition)
{ {
m_name = "Primitive"; m_name = "Object";
Rezzed = DateTime.UtcNow; Rezzed = DateTime.UtcNow;
_creationDate = (int)Utils.DateTimeToUnixTime(Rezzed); _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
@ -1625,7 +1625,7 @@ namespace OpenSim.Region.Framework.Scenes
PrimitiveBaseShape shape = PrimitiveBaseShape.Create(); PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
part.Shape = shape; part.Shape = shape;
part.Name = "Primitive"; part.Name = "Object";
part._ownerID = UUID.Random(); part._ownerID = UUID.Random();
return part; return part;