ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
View File

@@ -36,7 +36,7 @@ namespace OpenSim.Region.Framework.Interfaces
void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID,
InventoryItemBase item);
void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
bool HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
uint callbackID, string description, string name, sbyte invType,
sbyte type, byte wearableType, uint nextOwnerMask);

10
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
View File

@@ -26,6 +26,7 @@
*/
using System;
using System.Xml;
using System.Collections.Generic;
using OpenMetaverse;
using OpenSim.Framework;
@@ -89,7 +90,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="addToInventory">If true then add object to user inventory</param>
/// <param name="append">Append to attachment point rather than replace.</param>
/// <returns>true if the object was successfully attached, false otherwise</returns>
bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool addToInventory, bool append);
bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool addToInventory, bool append);
/// <summary>
/// Rez an attachment from user inventory and change inventory status to match.
@@ -98,7 +99,11 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="itemID"></param>
/// <param name="AttachmentPt"></param>
/// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
// Same as above, but also load script states from a separate doc
ISceneEntity RezSingleAttachmentFromInventory(
IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc);
/// <summary>
/// Rez multiple attachments from a user's inventory
@@ -130,7 +135,6 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="grp">The attachment to detach.</param>
void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp);
/// <summary>
/// Update the position of an attachment.
/// </summary>
/// <param name="sog"></param>

3
OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
View File

@@ -35,6 +35,7 @@ namespace OpenSim.Services.Interfaces
public interface IBakedTextureModule
{
WearableCacheItem[] Get(UUID id);
void Store(UUID id, WearableCacheItem[] data);
void Store(UUID id);
void UpdateMeshAvatar(UUID id);
}
}

8
OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
View File

@@ -40,19 +40,19 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary>
/// <param name="agentId"></param>
/// <param name="capsObjectPath"></param>
void CreateCaps(UUID agentId);
void CreateCaps(UUID agentId, uint circuitCode);
/// <summary>
/// Remove the caps handler for a given agent.
/// </summary>
/// <param name="agentId"></param>
void RemoveCaps(UUID agentId);
void RemoveCaps(UUID agentId, uint circuitCode);
/// <summary>
/// Will return null if the agent doesn't have a caps handler registered
/// </summary>
/// <param name="agentId"></param>
Caps GetCapsForUser(UUID agentId);
Caps GetCapsForUser(uint circuitCode);
void SetAgentCapsSeeds(AgentCircuitData agent);
@@ -65,5 +65,7 @@ namespace OpenSim.Region.Framework.Interfaces
void DropChildSeed(UUID agentID, ulong handle);
string GetCapsPath(UUID agentId);
void ActivateCaps(uint circuitCode);
}
}

1
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
View File

@@ -43,6 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces
public enum UserMode : int
{
Normal = 0,
RegionManager = 2,
God = 3
}

5
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
View File

@@ -133,6 +133,8 @@ namespace OpenSim.Region.Framework.Interfaces
/// </returns>
bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
/// <summary>
/// Stop and remove a script which is in this prim's inventory from the scene.
/// </summary>
@@ -244,7 +246,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="objlist">The scene objects</param>
/// <param name="veclist">Relative offsets for each object</param>
/// <returns>true = success, false = the scene object asset couldn't be found</returns>
bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist);
bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist, out Vector3 bbox, out float offsetHeight);
/// <summary>
/// Update an existing inventory item.
@@ -318,5 +320,6 @@ namespace OpenSim.Region.Framework.Interfaces
/// A <see cref="Dictionary`2"/>
/// </returns>
Dictionary<UUID, string> GetScriptStates();
Dictionary<UUID, string> GetScriptStates(bool oldIDs);
}
}

8
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
View File

@@ -36,6 +36,7 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Interfaces
{
public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
public delegate ScenePresence CrossAsyncDelegate(ScenePresence agent, bool isFlying);
public interface IEntityTransferModule
{
@@ -92,10 +93,17 @@ namespace OpenSim.Region.Framework.Interfaces
void EnableChildAgent(ScenePresence agent, GridRegion region);
<<<<<<< HEAD
GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version,
out Vector3 newpos, out string reason);
=======
GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos);
GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition, out Vector3 newpos);
bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason);
>>>>>>> avn/ubitvar
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent);
ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);

5
OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
View File

@@ -58,6 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IHttpRequestModule
{
UUID MakeHttpRequest(string url, string parameters, string body);
<<<<<<< HEAD
/// <summary>
/// Starts the http request.
@@ -87,6 +88,10 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name='id'></param>
void StopHttpRequestsForScript(UUID id);
=======
UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
void StopHttpRequest(uint m_localID, UUID m_itemID);
>>>>>>> avn/ubitvar
IServiceRequest GetNextCompletedRequest();
void RemoveCompletedRequest(UUID id);
}

18
OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
View File

@@ -25,13 +25,29 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
<<<<<<< HEAD
using System.Drawing;
using OpenSim.Framework;
=======
using OpenMetaverse;
using OpenSim.Framework;
using System.Drawing;
>>>>>>> avn/ubitvar
namespace OpenSim.Region.Framework.Interfaces
{
public interface IMapImageUploadModule
{
<<<<<<< HEAD
void UploadMapTile(IScene scene, Bitmap mapTile);
}
}
}
=======
/// <summary>
/// Upload a new maptile
/// </summary>
void UploadMapTile(IScene scene);
void UploadMapTile(IScene scene, Bitmap mapTile);
}
}
>>>>>>> avn/ubitvar

5
OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
View File

@@ -127,7 +127,12 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
/// <param name="options">
/// Dictionary of options.
<<<<<<< HEAD
/// </param>
void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options);
=======
/// </param>
void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options);
>>>>>>> avn/ubitvar
}
}

4
OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
View File

@@ -30,8 +30,12 @@ using OpenSim.Framework;
namespace OpenSim.Region.Framework.Interfaces
{
public delegate void ConsoleMessage(UUID toAgentID, string message);
public interface IRegionConsole
{
event ConsoleMessage OnConsoleMessage;
bool RunCommand(string command, UUID invokerID);
void SendConsoleOutput(UUID agentID, string message);
void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn);

1
OpenSim/Region/Framework/Interfaces/IRestartModule.cs
View File

@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces
TimeSpan TimeUntilRestart { get; }
void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice);
void AbortRestart(string message);
void DelayRestart(int seconds, string message);
}
}

2
OpenSim/Region/Framework/Interfaces/ISearchModule.cs
View File

@@ -31,6 +31,6 @@ namespace OpenSim.Framework
{
public interface ISearchModule
{
void Refresh();
}
}

2
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
View File

@@ -125,6 +125,8 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="regionUUID">the region UUID</param>
void RemoveRegionEnvironmentSettings(UUID regionUUID);
UUID[] GetObjectIDs(UUID regionID);
void SaveExtra(UUID regionID, string name, string value);
void RemoveExtra(UUID regionID, string name);

1
OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
View File

@@ -115,6 +115,7 @@ namespace OpenSim.Region.Framework.Interfaces
RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
void StoreRegionWindlightSettings(RegionLightShareData wl);
void RemoveRegionWindlightSettings(UUID regionID);
UUID[] GetObjectIDs(UUID regionID);
/// <summary>
/// Load Environment settings from region storage

27
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs Normal file
View File

@@ -0,0 +1,27 @@
///////////////////////////////////////////////////////////////////
//
// (c) Careminster LImited, Melanie Thielker and the Meta7 Team
//
// This file is not open source. All rights reserved
// Mod 2
using OpenSim.Region.Framework.Scenes;
public interface ISnmpModule
{
void Trap(int code, string Message, Scene scene);
void Critical(string Message, Scene scene);
void Warning(string Message, Scene scene);
void Major(string Message, Scene scene);
void ColdStart(int step , Scene scene);
void Shutdown(int step , Scene scene);
//
// Node Start/stop events
//
void LinkUp(Scene scene);
void LinkDown(Scene scene);
void BootInfo(string data, Scene scene);
void trapDebug(string Module,string data, Scene scene);
void trapXMRE(int data, string Message, Scene scene);
}

2
OpenSim/Region/Framework/Interfaces/ISoundModule.cs
View File

@@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="radius">Sound radius</param>
/// <param name="isMaster">Set object to sync master if true</param>
void LoopSound(UUID objectID, UUID soundID, double gain,
double radius, bool isMaster);
double radius, bool isMaster, bool isSlave);
/// <summary>
/// Trigger or play an attached sound in this part's inventory.

15
OpenSim/Region/Framework/Interfaces/ITerrainModule.cs
View File

@@ -28,6 +28,11 @@ using System.IO;
using OpenSim.Framework;
<<<<<<< HEAD
=======
using System.IO;
using OpenSim.Framework;
>>>>>>> avn/ubitvar
using OpenMetaverse;
namespace OpenSim.Region.Framework.Interfaces
@@ -43,7 +48,13 @@ namespace OpenSim.Region.Framework.Interfaces
/// Use this if you change terrain data outside of the terrain module (e.g. in osTerrainSetHeight)
/// </summary>
void TaintTerrain();
/// <summary>
/// When a client initially connects, all the terrain must be pushed to the viewer.
/// This call causes all the terrain patches to be sent to the client.
/// </summary>
void PushTerrain(IClientAPI pClient);
/// <summary>
/// When a client initially connects, all the terrain must be pushed to the viewer.
/// This call causes all the terrain patches to be sent to the client.
@@ -60,6 +71,8 @@ namespace OpenSim.Region.Framework.Interfaces
void LoadFromStream(string filename, Stream stream);
void LoadFromStream(string filename, Vector3 displacement, float radianRotation, Vector2 rotationDisplacement, Stream stream);
void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap);
void LoadFromStream(string filename, Vector3 displacement,
float radianRotation, Vector2 rotationDisplacement, Stream stream);
/// <summary>
/// Save a terrain to a stream.
/// </summary>

13
OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs Normal file
View File

@@ -0,0 +1,13 @@
///////////////////////////////////////////////////////////////////
//
// (c) Careminster Limited, Melanie Thielker and the Meta7 Team
//
// This file is not open source. All rights reserved
//
using OpenSim.Region.Framework.Scenes;
public interface IUserAccountCacheModule
{
void Remove(string name);
}

2
OpenSim/Region/Framework/Interfaces/IWorldComm.cs
View File

@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name='msg'>
/// Message.
/// </param>
void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg);
bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error);
/// <summary>
/// Are there any listen events ready to be dispatched?

4
OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
View File

@@ -37,6 +37,10 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary>
void GenerateMaptile();
List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag);
<<<<<<< HEAD
MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag);
=======
void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag);
>>>>>>> avn/ubitvar
}
}