mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 11:33:28 +08:00
* Cleaned namespaces of entire solution. OpenSim directories now correspond with namespaces.
This commit is contained in:
@@ -32,11 +32,10 @@ using System.IO;
|
||||
using System.Reflection;
|
||||
using libsecondlife;
|
||||
using log4net;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Framework.Servers;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
public delegate void UpLoadedAsset(
|
||||
string assetName, string description, LLUUID assetID, LLUUID inventoryItem, LLUUID parentFolder,
|
||||
@@ -54,8 +53,8 @@ namespace OpenSim.Region.Capabilities
|
||||
bool isScriptRunning, byte[] data);
|
||||
|
||||
public delegate List<InventoryItemBase> FetchInventoryDescendentsCAPS(LLUUID agentID, LLUUID folderID, LLUUID ownerID,
|
||||
bool fetchFolders, bool fetchItems, int sortOrder);
|
||||
|
||||
bool fetchFolders, bool fetchItems, int sortOrder);
|
||||
|
||||
/// <summary>
|
||||
/// XXX Probably not a particularly nice way of allow us to get the scene presence from the scene (chiefly so that
|
||||
/// we can popup a message on the user's client if the inventory service has permanently failed). But I didn't want
|
||||
@@ -397,7 +396,7 @@ namespace OpenSim.Region.Capabilities
|
||||
/// <returns></returns>
|
||||
public string RequestTexture(string request, string path, string param)
|
||||
{
|
||||
Console.WriteLine("texture request " + request);
|
||||
System.Console.WriteLine("texture request " + request);
|
||||
// Needs implementing (added to remove compiler warning)
|
||||
return String.Empty;
|
||||
}
|
||||
@@ -961,4 +960,4 @@ namespace OpenSim.Region.Capabilities
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using OpenSim.Framework.Servers;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
/// <summary>
|
||||
/// CapsHandlers is a cap handler container but also takes
|
||||
@@ -141,4 +141,4 @@ namespace OpenSim.Region.Capabilities
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ using System.Text;
|
||||
using System.Xml;
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
/// <summary>
|
||||
/// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code.
|
||||
@@ -676,4 +676,4 @@ namespace OpenSim.Region.Capabilities
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using System.Collections;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("ARRAY")]
|
||||
public class LLSDArray
|
||||
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@
|
||||
using System;
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDAssetUploadComplete
|
||||
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@
|
||||
using System;
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDAssetUploadRequest
|
||||
@@ -43,4 +43,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using System;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDAssetUploadResponse
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDCapEvent
|
||||
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDEmpty
|
||||
@@ -34,4 +34,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Xml;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
public class LLSDHelpers
|
||||
{
|
||||
@@ -160,4 +160,4 @@ namespace OpenSim.Region.Capabilities
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDInventoryItem
|
||||
@@ -68,15 +68,6 @@ namespace OpenSim.Region.Capabilities
|
||||
public string sale_type;
|
||||
}
|
||||
|
||||
/* [LLSDMap]
|
||||
public class LLSDFolderItem
|
||||
{
|
||||
public LLUUID folder_id;
|
||||
public LLUUID parent_id;
|
||||
public int type;
|
||||
public string name;
|
||||
}*/
|
||||
|
||||
[LLSDMap]
|
||||
public class LLSDInventoryDescendents
|
||||
{
|
||||
@@ -103,4 +94,4 @@ namespace OpenSim.Region.Capabilities
|
||||
public LLUUID owner___id; // and of course we can't have field names with "-" in
|
||||
public int version;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDItemUpdate
|
||||
@@ -38,4 +38,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDMapLayer
|
||||
@@ -42,4 +42,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDMapLayerResponse
|
||||
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDMapRequest
|
||||
@@ -36,4 +36,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
using System.Collections;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDParcelVoiceInfoResponse
|
||||
|
||||
@@ -30,7 +30,7 @@ using System.IO;
|
||||
using System.Text;
|
||||
using OpenSim.Framework.Servers;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler
|
||||
where TRequest : new()
|
||||
@@ -65,4 +65,4 @@ namespace OpenSim.Region.Capabilities
|
||||
return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDTaskInventoryUploadComplete
|
||||
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities
|
||||
/// </summary>
|
||||
public string state;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using libsecondlife;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDTaskScriptUpdate
|
||||
@@ -47,4 +47,4 @@ namespace OpenSim.Region.Capabilities
|
||||
/// </summary>
|
||||
public int is_script_running;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDType("MAP")]
|
||||
public class LLSDTest
|
||||
@@ -37,4 +37,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
using System;
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[AttributeUsage(AttributeTargets.Class)]
|
||||
public class LLSDType : Attribute
|
||||
@@ -52,4 +52,4 @@ namespace OpenSim.Region.Capabilities
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OpenSim.Region.Capabilities
|
||||
namespace OpenSim.Framework.Communications.Capabilities
|
||||
{
|
||||
[LLSDMap]
|
||||
public class LLSDVoiceAccountResponse
|
||||
|
||||
Reference in New Issue
Block a user