Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

remove-scene-viewer
Mic Bowman 2011-10-04 15:44:22 -07:00
commit 413e299045
6 changed files with 393 additions and 393 deletions

View File

@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
m_attMod.RezSingleAttachmentFromInventory( m_attMod.RezSingleAttachmentFromInventory(
m_presence, attItemId, (uint)AttachmentPoint.Chest); m_presence, attItemId, (uint)AttachmentPoint.Chest);
m_attMod.DetachSingleAttachmentToInv(attItemId, m_presence.ControllingClient); m_attMod.DetachSingleAttachmentToInv(m_presence, attItemId);
// Check status on scene presence // Check status on scene presence
Assert.That(m_presence.HasAttachments(), Is.False); Assert.That(m_presence.HasAttachments(), Is.False);

View File

@ -28,7 +28,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
@ -40,6 +39,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// RezAttachments. This should only be called upon login on the first region. /// RezAttachments. This should only be called upon login on the first region.
/// Attachment rezzings on crossings and TPs are done in a different way. /// Attachment rezzings on crossings and TPs are done in a different way.
/// </summary> /// </summary>
/// <param name="sp"></param>
void RezAttachments(IScenePresence sp); void RezAttachments(IScenePresence sp);
/// <summary> /// <summary>
@ -50,17 +50,16 @@ namespace OpenSim.Region.Framework.Interfaces
/// <summary> /// <summary>
/// Delete all the presence's attachments from the scene /// Delete all the presence's attachments from the scene
/// </summary>
/// <param name="sp">
/// This is done when a root agent leaves/is demoted to child (for instance, on logout, teleport or region cross). /// This is done when a root agent leaves/is demoted to child (for instance, on logout, teleport or region cross).
/// </param> /// </summary>
/// <param name="sp"></param>
/// <param name="silent"></param> /// <param name="silent"></param>
void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); void DeleteAttachmentsFromScene(IScenePresence sp, bool silent);
/// <summary> /// <summary>
/// Attach an object to an avatar /// Attach an object to an avatar
/// </summary> /// </summary>
/// <param name="remoteClient"></param> /// <param name="sp"></param>
/// <param name="grp"></param> /// <param name="grp"></param>
/// <param name="AttachmentPt"></param> /// <param name="AttachmentPt"></param>
/// <param name="silent"></param> /// <param name="silent"></param>
@ -80,21 +79,9 @@ namespace OpenSim.Region.Framework.Interfaces
/// Rez multiple attachments from a user's inventory /// Rez multiple attachments from a user's inventory
/// </summary> /// </summary>
/// <param name="sp"></param> /// <param name="sp"></param>
/// <param name="header"></param> /// <param name="rezlist"></param>
/// <param name="objects"></param>
void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist); void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist);
/// <summary>
/// Detach an object from the avatar.
/// </summary>
/// <remarks>
/// This method is called in response to a client's detach request, so we only update the information in
/// inventory
/// </remarks>
/// <param name="objectLocalID"></param>
/// <param name="remoteClient"></param>
void DetachObject(uint objectLocalID, IClientAPI remoteClient);
/// <summary> /// <summary>
/// Detach the given item to the ground. /// Detach the given item to the ground.
/// </summary> /// </summary>
@ -105,9 +92,9 @@ namespace OpenSim.Region.Framework.Interfaces
/// <summary> /// <summary>
/// Detach the given item so that it remains in the user's inventory. /// Detach the given item so that it remains in the user's inventory.
/// </summary> /// </summary>
/// <param name="itemID">/param> /// <param name="sp">/param>
/// <param name="remoteClient"></param> /// <param name="itemID"></param>
void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient); void DetachSingleAttachmentToInv(IScenePresence sp, UUID itemID);
/// <summary> /// <summary>
/// Update the position of an attachment. /// Update the position of an attachment.

View File

@ -3023,7 +3023,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule; IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
if (attachmentsModule != null) if (attachmentsModule != null)
attachmentsModule.DetachSingleAttachmentToInv(itemID, presence.ControllingClient); attachmentsModule.DetachSingleAttachmentToInv(presence, itemID);
} }
public void llTakeCamera(string avatar) public void llTakeCamera(string avatar)

View File

@ -223,11 +223,11 @@
;; server to send mail through. ;; server to send mail through.
; emailmodule = DefaultEmailModule ; emailmodule = DefaultEmailModule
; Controls whether previously compiled scripts are deleted on sim restart. If you disable this ;# {DeleteScriptsOnRestart} {} {Delete compiled script DLLs on restart?} (true false) true
; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
; by scripts have changed. ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
; Default is false ;; by scripts have changed.
; DeleteScriptsOnStartup = true ; DeleteScriptsOnStartup = true

View File

@ -1194,12 +1194,11 @@
;; Path to script assemblies ;; Path to script assemblies
; ScriptEnginesPath = "ScriptEngines" ; ScriptEnginesPath = "ScriptEngines"
; Controls whether previously compiled scripts are deleted on sim restart. If you disable this ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
; by scripts have changed. ; by scripts have changed.
; Default is false ; DeleteScriptsOnStartup = false
; DeleteScriptsOnStartup = true
[OpenGridProtocol] [OpenGridProtocol]