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

Merge branch 'master' into dev 

Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
dsg
Dan Lake 2011-07-25 16:08:00 -07:00
parent 2aaad3c91a d0c5d592c2
commit 1091001cf6
42 changed files with 356 additions and 672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/AvatarAppearance.cs
View File

@ -196,6 +196,9 @@ namespace OpenSim.Framework
if (appearance.VisualParams != null)
m_visualparams = (byte[])appearance.VisualParams.Clone();
m_avatarHeight = appearance.m_avatarHeight;
m_hipOffset = appearance.m_hipOffset;
// Copy the attachment, force append mode since that ensures consistency
m_attachments = new Dictionary<int, List<AvatarAttachment>>();
foreach (AvatarAttachment attachment in appearance.GetAttachments())
@ -237,7 +240,6 @@ namespace OpenSim.Framework
{
m_serial = 0;
SetDefaultParams();
SetDefaultTexture();
//for (int i = 0; i < BAKE_INDICES.Length; i++)

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1407,7 +1407,7 @@ namespace OpenSim.Framework
void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId);
void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId);
void StopFlying(ISceneEntity presence);

8
OpenSim/Framework/InventoryFolderImpl.cs
View File

@ -27,13 +27,15 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using log4net;
using OpenMetaverse;
namespace OpenSim.Framework
{
public class InventoryFolderImpl : InventoryFolderBase
{
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public static readonly string PATH_DELIMITER = "/";
@ -402,6 +404,10 @@ namespace OpenSim.Framework
{
foreach (InventoryItemBase item in Items.Values)
{
// m_log.DebugFormat(
// "[INVENTORY FOLDER IMPL]: Returning item {0} {1}, OwnerPermissions {2:X}",
// item.Name, item.ID, item.CurrentPermissions);
itemList.Add(item);
}
}

5
OpenSim/Framework/RegionInfo.cs
View File

@ -840,7 +840,10 @@ namespace OpenSim.Framework
"Clamp prims to max size", "false", true);
configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
"Max objects this sim will hold", "0", true);
"Max objects this sim will hold", "15000", true);
configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
"Max avatars this sim will hold", "100", true);
configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
"Scope ID for this region", UUID.Zero.ToString(), true);

2
OpenSim/Framework/TaskInventoryDictionary.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Framework
clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
}
}
return clone;
}

7
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -12206,7 +12206,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(packet, ThrottleOutPacketType.Task);
}
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
{
ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
dialog.Data.ObjectID = objectId;
@ -12222,6 +12222,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buttons[0] = new ScriptDialogPacket.ButtonsBlock();
buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!");
dialog.Buttons = buttons;
dialog.OwnerData = new ScriptDialogPacket.OwnerDataBlock[1];
dialog.OwnerData[0] = new ScriptDialogPacket.OwnerDataBlock();
dialog.OwnerData[0].OwnerID = ownerID;
OutPacket(dialog, ThrottleOutPacketType.Task);
}

39
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
changed = sp.Appearance.SetVisualParams(visualParams);
if (sp.Appearance.AvatarHeight > 0)
sp.SetHeight(sp.Appearance.AvatarHeight);
}
}
// Process the baked texture array
if (textureEntry != null)
@ -224,12 +224,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// update transaction. In theory, we should be able to do an immediate
// appearance send and save here.
// save only if there were changes, send no matter what (doesn't hurt to send twice)
if (changed)
QueueAppearanceSave(client.AgentId);
QueueAppearanceSend(client.AgentId);
}
// save only if there were changes, send no matter what (doesn't hurt to send twice)
if (changed)
QueueAppearanceSave(client.AgentId);
QueueAppearanceSend(client.AgentId);
}
// m_log.WarnFormat("[AVFACTORY]: complete SetAppearance for {0}:\n{1}",client.AgentId,sp.Appearance.ToString());
@ -447,11 +447,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// m_log.WarnFormat("[AVFACTORY]: AvatarIsWearing called for {0}", client.AgentId);
// we need to clean out the existing textures
sp.Appearance.ResetAppearance();
sp.Appearance.ResetAppearance();
// operate on a copy of the appearance so we don't have to lock anything
// operate on a copy of the appearance so we don't have to lock anything yet
AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance, false);
foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
{
if (wear.Type < AvatarWearable.MAX_WEARABLES)
@ -463,14 +463,19 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// This could take awhile since it needs to pull inventory
SetAppearanceAssets(sp.UUID, ref avatAppearance);
// could get fancier with the locks here, but in the spirit of "last write wins"
// this should work correctly, also, we don't need to send the appearance here
// since the "iswearing" will trigger a new set of visual param and baked texture changes
// when those complete, the new appearance will be sent
sp.Appearance = avatAppearance;
if (sp.Appearance.AvatarHeight > 0)
sp.SetHeight(sp.Appearance.AvatarHeight);
QueueAppearanceSave(client.AgentId);
lock (m_setAppearanceLock)
{
// Update only those fields that we have changed. This is important because the viewer
// often sends AvatarIsWearing and SetAppearance packets at once, and AvatarIsWearing
// shouldn't overwrite the changes made in SetAppearance.
sp.Appearance.Wearables = avatAppearance.Wearables;
sp.Appearance.Texture = avatAppearance.Texture;
// We don't need to send the appearance here since the "iswearing" will trigger a new set
// of visual param and baked texture changes. When those complete, the new appearance will be sent
QueueAppearanceSave(client.AgentId);
}
}
private void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance)

4
OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View File

@ -148,10 +148,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
{
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
string ownerFirstName, ownerLastName;
UUID ownerID = UUID.Zero;
if (account != null)
{
ownerFirstName = account.FirstName;
ownerLastName = account.LastName;
ownerID = account.PrincipalID;
}
else
{
@ -162,7 +164,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
ScenePresence sp = m_scene.GetScenePresence(avatarid);
if (sp != null)
sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerID, ownerFirstName, ownerLastName, objectid);
}
public void SendNotificationToUsersInRegion(

4
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -994,11 +994,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
public virtual bool CanGetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID)
{
InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID);
if (assetRequestItem == null)
{
ILibraryService lib = m_Scene.RequestModuleInterface<ILibraryService>();
if (lib != null)
assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
if (assetRequestItem == null)
return false;
}
@ -1029,6 +1032,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}",
Name, requestID, itemID, assetRequestItem.AssetID);
return false;
}

12
OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
View File

@ -185,6 +185,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false);
archread.Execute();
}
foreach (InventoryNodeBase node in nodes)
FixPerms(node);
}
@ -197,18 +198,19 @@ namespace OpenSim.Region.CoreModules.Framework.Library
archread.Close();
}
}
}
private void FixPerms(InventoryNodeBase node)
{
m_log.DebugFormat("[LIBRARY MODULE]: Fixing perms for {0} {1}", node.Name, node.ID);
if (node is InventoryItemBase)
{
InventoryItemBase item = (InventoryItemBase)node;
item.BasePermissions = 0x7FFFFFFF;
item.EveryOnePermissions = 0x7FFFFFFF;
item.CurrentPermissions = 0x7FFFFFFF;
item.NextPermissions = 0x7FFFFFFF;
item.BasePermissions = (uint)PermissionMask.All;
item.EveryOnePermissions = (uint)PermissionMask.All - (uint)PermissionMask.Modify;
item.CurrentPermissions = (uint)PermissionMask.All;
item.NextPermissions = (uint)PermissionMask.All;
}
}

17
OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
View File

@ -39,8 +39,7 @@ using OpenMetaverse;
namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
{
public class LocalAuthorizationServicesConnector :
ISharedRegionModule, IAuthorizationService
public class LocalAuthorizationServicesConnector : ISharedRegionModule, IAuthorizationService
{
private static readonly ILog m_log =
LogManager.GetLogger(
@ -127,15 +126,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
if (!m_Enabled)
return;
m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: Enabled local authorization for region {0}", scene.RegionInfo.RegionName);
m_log.InfoFormat(
"[AUTHORIZATION CONNECTOR]: Enabled local authorization for region {0}",
scene.RegionInfo.RegionName);
}
public bool IsAuthorizedForRegion(string userID, string regionID, out string message)
public bool IsAuthorizedForRegion(
string userID, string firstName, string lastName, string regionID, out string message)
{
return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message);
return m_AuthorizationService.IsAuthorizedForRegion(userID, firstName, lastName, regionID, out message);
}
}
}
}

24
OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
View File

@ -117,12 +117,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
}
public bool IsAuthorizedForRegion(string userID, string regionID, out string message)
public bool IsAuthorizedForRegion(
string userID, string firstName, string lastName, string regionID, out string message)
{
m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID);
m_log.InfoFormat(
"[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID);
bool isAuthorized = true;
message = String.Empty;
string mail = String.Empty;
// get the scene this call is being made for
Scene scene = null;
@ -140,17 +143,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
if (scene != null)
{
UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID));
isAuthorized = IsAuthorizedForRegion(userID, account.FirstName, account.LastName,
account.Email, scene.RegionInfo.RegionName, regionID, out message);
if (account != null)
mail = account.Email;
isAuthorized
= IsAuthorizedForRegion(
userID, firstName, lastName, account.Email, scene.RegionInfo.RegionName, regionID, out message);
}
else
{
m_log.ErrorFormat("[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0} ",regionID);
m_log.ErrorFormat(
"[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0}",
regionID);
}
return isAuthorized;
}
}
}
}

2
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
= ParseUserSetConfigSetting(myConfig, "allowed_script_editors", m_allowedScriptEditors);
if (m_bypassPermissions)
m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks");
m_log.Info("[PERMISSIONS]: serverside_object_permissions = false in ini file so disabling all region service permission checks");
else
m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");

10
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -1110,14 +1110,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (data == null)
return;
UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE");
m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Random();
UUID terrainImageID = UUID.Random();
AssetBase asset = new AssetBase(
m_scene.RegionInfo.RegionSettings.TerrainImageID,
terrainImageID,
"terrainImage_" + m_scene.RegionInfo.RegionID.ToString(),
(sbyte)AssetType.Texture,
m_scene.RegionInfo.RegionID.ToString());
@ -1129,6 +1127,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// Store the new one
m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID);
m_scene.AssetService.Store(asset);
// Switch to the new one
UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
m_scene.RegionInfo.RegionSettings.Save();
// Delete the old one

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -1162,7 +1162,7 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
{
}

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

@ -895,7 +895,10 @@ namespace OpenSim.Region.Framework.Scenes
newName = item.Name;
}
if (remoteClient.AgentId == oldAgentID || (LibraryService != null && LibraryService.LibraryRootFolder != null && oldAgentID == LibraryService.LibraryRootFolder.Owner))
if (remoteClient.AgentId == oldAgentID
|| (LibraryService != null
&& LibraryService.LibraryRootFolder != null
&& oldAgentID == LibraryService.LibraryRootFolder.Owner))
{
CreateNewInventoryItem(
remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, asset, (sbyte)item.InvType,

29
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2301,20 +2301,20 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneGridService.SetScene(this);
// If we generate maptiles internally at all, the maptile generator
// will register the region. If not, do it here
GridRegion region = new GridRegion(RegionInfo);
string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
if (error != String.Empty)
{
throw new Exception(error);
}
// Generate the maptile asynchronously, because sometimes it can be very slow and we
// don't want this to delay starting the region.
if (m_generateMaptiles)
{
RegenerateMaptile(null, null);
}
else
{
GridRegion region = new GridRegion(RegionInfo);
string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
if (error != String.Empty)
{
throw new Exception(error);
}
Util.FireAndForget(delegate {
RegenerateMaptile(null, null);
});
}
}
@ -4259,11 +4259,12 @@ namespace OpenSim.Region.Framework.Scenes
if (AuthorizationService != null)
{
if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString(),out reason))
if (!AuthorizationService.IsAuthorizedForRegion(
agent.AgentID.ToString(), agent.firstname, agent.lastname, RegionInfo.RegionID.ToString(), out reason))
{
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
//reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName);
return false;
}
}

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

@ -1089,7 +1089,7 @@ namespace OpenSim.Region.Framework.Scenes
{
actor.Size = m_shape.Scale;
if (((OpenMetaverse.SculptType)Shape.SculptType) == SculptType.Mesh)
if (Shape.SculptEntry)
CheckSculptAndLoad();
else
ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
@ -1958,7 +1958,7 @@ namespace OpenSim.Region.Framework.Scenes
// If this part is a sculpt then delay the physics update until we've asynchronously loaded the
// mesh data.
if (((OpenMetaverse.SculptType)Shape.SculptType) == SculptType.Mesh)
if (Shape.SculptEntry)
CheckSculptAndLoad();
else
m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1688,7 +1688,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
{
}
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
{
}

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -1164,7 +1164,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
}
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
{
}

2
OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Authorization
AuthorizationRequest Authorization = (AuthorizationRequest) xs.Deserialize(request);
string message = String.Empty;
bool authorized = m_AuthorizationService.IsAuthorizedForRegion(Authorization.ID, Authorization.RegionID,out message);
bool authorized = m_AuthorizationService.IsAuthorizedForRegion(Authorization.ID, Authorization.FirstName, Authorization.SurName, Authorization.RegionID, out message);
AuthorizationResponse result = new AuthorizationResponse(authorized, Authorization.ID + " has been authorized");

5
OpenSim/Services/AuthorizationService/AuthorizationService.cs
View File

@ -48,10 +48,11 @@ namespace OpenSim.Services.AuthorizationService
m_log.Info("[AUTHORIZATION CONNECTOR]: Local Authorization service enabled");
}
public bool IsAuthorizedForRegion(string userID, string regionID, out string message)
public bool IsAuthorizedForRegion(
string userID, string firstName, string lastName, string regionID, out string message)
{
message = "Authorized";
return true;
}
}
}
}

56
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@ -48,6 +48,13 @@ namespace OpenSim.Services.Connectors
private string m_ServerURI = String.Empty;
private IImprovedAssetCache m_Cache = null;
private delegate void AssetRetrievedEx(AssetBase asset);
// Keeps track of concurrent requests for the same asset, so that it's only loaded once.
// Maps: Asset ID -> Handlers which will be called when the asset has been loaded
private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>();
public AssetServicesConnector()
{
}
@ -178,23 +185,56 @@ namespace OpenSim.Services.Connectors
if (asset == null)
{
bool result = false;
lock (m_AssetHandlers)
{
AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
AsynchronousRestObjectRequester.
MakeRequest<int, AssetBase>("GET", uri, 0,
AssetRetrievedEx handlers;
if (m_AssetHandlers.TryGetValue(id, out handlers))
{
// Someone else is already loading this asset. It will notify our handler when done.
handlers += handlerEx;
return true;
}
// Load the asset ourselves
handlers += handlerEx;
m_AssetHandlers.Add(id, handlers);
}
bool success = false;
try
{
AsynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0,
delegate(AssetBase a)
{
if (m_Cache != null)
m_Cache.Cache(a);
handler(id, sender, a);
result = true;
});
return result;
AssetRetrievedEx handlers;
lock (m_AssetHandlers)
{
handlers = m_AssetHandlers[id];
m_AssetHandlers.Remove(id);
}
handlers.Invoke(a);
});
success = true;
}
finally
{
if (!success)
{
lock (m_AssetHandlers)
{
m_AssetHandlers.Remove(id);
}
}
}
}
else
{
//Util.FireAndForget(delegate { handler(id, sender, asset); });
handler(id, sender, asset);
}

32
OpenSim/Services/Interfaces/IAuthorizationService.cs
View File

@ -34,14 +34,21 @@ namespace OpenSim.Services.Interfaces
public interface IAuthorizationService
{
//////////////////////////////////////////////////////
// Authorized
//
// This method returns a simple true false indicating
// whether or not a user has access to the region
//
bool IsAuthorizedForRegion(string userID, string regionID, out string message);
/// <summary>
/// Check whether the user should be given access to the region.
/// </summary>
/// <remarks>
/// We also supply user first name and last name for situations where the user does not have an account
/// on the region (e.g. they're a visitor via Hypergrid).
/// </remarks>
/// <param name="userID"></param>
/// <param name="firstName">/param>
/// <param name="lastName"></param>
/// <param name="regionID"></param>
/// <param name="message"></param>
/// <returns></returns>
bool IsAuthorizedForRegion(
string userID, string firstName, string lastName, string regionID, out string message);
}
public class AuthorizationRequest
@ -63,7 +70,8 @@ namespace OpenSim.Services.Interfaces
m_regionID = RegionID;
}
public AuthorizationRequest(string ID,string FirstName, string SurName, string Email, string RegionName, string RegionID)
public AuthorizationRequest(
string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID)
{
m_userID = ID;
m_firstname = FirstName;
@ -108,9 +116,6 @@ namespace OpenSim.Services.Interfaces
get { return m_regionID; }
set { m_regionID = value; }
}
}
public class AuthorizationResponse
@ -126,7 +131,6 @@ namespace OpenSim.Services.Interfaces
{
m_isAuthorized = isAuthorized;
m_message = message;
}
public bool IsAuthorized
@ -141,4 +145,4 @@ namespace OpenSim.Services.Interfaces
set { m_message = value; }
}
}
}
}

9
OpenSim/Services/InventoryService/LibraryService.cs
View File

@ -193,10 +193,11 @@ namespace OpenSim.Services.InventoryService
item.Description = config.GetString("description", item.Name);
item.InvType = config.GetInt("inventoryType", 0);
item.AssetType = config.GetInt("assetType", item.InvType);
item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF);
item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF);
item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF);
item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF);
item.CurrentPermissions = (uint)config.GetLong("currentPermissions", (uint)PermissionMask.All);
item.NextPermissions = (uint)config.GetLong("nextPermissions", (uint)PermissionMask.All);
item.EveryOnePermissions
= (uint)config.GetLong("everyonePermissions", (uint)PermissionMask.All - (uint)PermissionMask.Modify);
item.BasePermissions = (uint)config.GetLong("basePermissions", (uint)PermissionMask.All);
item.Flags = (uint)config.GetInt("flags", 0);
if (libraryFolders.ContainsKey(item.Folder))

2
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -1224,7 +1224,7 @@ namespace OpenSim.Tests.Common.Mock
{
}
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
{
}

BIN
bin/MXP.pdb
View File

Binary file not shown.

30
bin/OpenSim.ini.example
View File

@ -68,15 +68,6 @@
;; in a <Regions> tag.
; regionload_webserver_url = "http://example.com/regions.xml";
;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} false
;; Use terrain texture for maptiles if true, use shaded green if false
; TextureOnMapTile = false
;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
;; Draw objects on maptile. This step might take a long time if you've
;; got a large number of objects, so you can turn it off here if you'd like.
; DrawPrimOnMapTile = true
;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
; NonPhysicalPrimMax = 256
@ -89,9 +80,11 @@
;; This can be overriden in the region config file.
; ClampPrimSize = false
;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false
;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded.
; AllowScriptCrossing = false
;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true
;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region.
;; This only applies when crossing to a region running in a different simulator.
;; For crossings where the regions are on the same simulator the script is always kept running.
; AllowScriptCrossing = true
;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false
;; Allow compiled script binary code to cross region boundaries.
@ -190,7 +183,7 @@
;; Map tile options. You can choose to generate no map tiles at all,
;; generate normal maptiles, or nominate an uploaded texture to
;; be the map tile
; GenerateMaptiles = "true"
; GenerateMaptiles = true
;; If desired, a running region can update the map tiles periodically
;; to reflect building activity. This names no sense of you don't have
@ -200,6 +193,15 @@
;; If not generating maptiles, use this static texture asset ID
; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
;; Use terrain texture for maptiles if true, use shaded green if false
; TextureOnMapTile = true
;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
;; Draw objects on maptile. This step might take a long time if you've
;; got a large number of objects, so you can turn it off here if you'd like.
; DrawPrimOnMapTile = true
;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
; HttpProxy = "http://proxy.com:8080"
@ -218,7 +220,7 @@
;; The SMTP server enabled the email module to send email to external
;; destinations.
;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true
;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
;; Enable sending email via SMTP
; enabled = false

44
bin/OpenSimDefaults.ini
View File

@ -67,12 +67,6 @@
; except that everything is also enclosed in a <Regions> tag.
; regionload_webserver_url = "http://example.com/regions.xml";
; Draw objects on maptile. This step might take a long time if you've got a large number of
; objects, so you can turn it off here if you'd like.
DrawPrimOnMapTile = true
; Use terrain texture for maptiles if true, use shaded green if false
TextureOnMapTile = false
; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
NonPhysicalPrimMax = 256
@ -83,8 +77,10 @@
; This can be overriden in the region config file.
ClampPrimSize = false
; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded.
AllowScriptCrossing = false
; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region.
; This only applies when crossing to a region running in a different simulator.
; For crossings where the regions are on the same simulator the script is always kept running.
AllowScriptCrossing = true
; Allow compiled script binary code to cross region boundaries.
; If you set this to "true", any region that can teleport to you can
@ -175,8 +171,8 @@
; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
; any item, etc. This may not yet be implemented uniformally.
; If set to true, then all permissions checks are carried out
; Default is false
serverside_object_permissions = false
; Default is true
serverside_object_permissions = true
allow_grid_gods = false
@ -216,13 +212,23 @@
;WorldMapModule = "WorldMap"
;MapImageModule = "MapImageModule"
; Set to false to not generate any maptiles
;GenerateMaptiles = "true"
;GenerateMaptiles = true
; Refresh (in seconds) the map tile periodically
;MaptileRefresh = 0
; If not generating maptiles, use this static texture asset ID
;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
; Draw objects on maptile. This step might take a long time if you've got a large number of
; objects, so you can turn it off here if you'd like.
DrawPrimOnMapTile = true
; Use terrain texture for maptiles if true, use shaded green if false
TextureOnMapTile = true
; ##
; ## EMAIL MODULE
; ##
@ -273,15 +279,15 @@
[SMTP]
enabled=false
enabled = false
;enabled=true
;internal_object_host=lsl.opensim.local
;host_domain_header_from=127.0.0.1
;SMTP_SERVER_HOSTNAME=127.0.0.1
;SMTP_SERVER_PORT=25
;SMTP_SERVER_LOGIN=foo
;SMTP_SERVER_PASSWORD=bar
;enabled = true
;internal_object_host = lsl.opensim.local
;host_domain_header_from = 127.0.0.1
;SMTP_SERVER_HOSTNAME = 127.0.0.1
;SMTP_SERVER_PORT = 25
;SMTP_SERVER_LOGIN = foo
;SMTP_SERVER_PASSWORD = bar
[Network]

6
bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml
View File

@ -108,8 +108,6 @@
<Key Name="inventoryType" Value="19" />
</Section>
<!--
<Section Name="Example Library Item">
<Key Name="inventoryID" Value="30000000-0000-2222-4444-000000000001" />
@ -119,10 +117,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->

33
bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
<!--
@ -24,10 +20,6 @@
<Key Name="name" Value="Hair" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="18" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Skin">
@ -38,10 +30,6 @@
<Key Name="name" Value="Skin" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="18" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
<!--
@ -53,10 +41,6 @@
<Key Name="name" Value="Jim Skin" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="13" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Little Goblin Skin">
@ -67,10 +51,6 @@
<Key Name="name" Value="Little Goblin Skin" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="13" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
<!--
@ -82,10 +62,6 @@
<Key Name="name" Value="Shape" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="18" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
<!--
@ -97,10 +73,6 @@
<Key Name="name" Value="Jim Shape" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="13" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Little Goblin Shape">
@ -111,10 +83,7 @@
<Key Name="name" Value="Little Goblin Shape" />
<Key Name="assetType" Value="13" />
<Key Name="inventoryType" Value="13" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
</Nini>

14
bin/inventory/ClothingLibrary/ClothingLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
<!--
@ -24,11 +20,8 @@
<Key Name="name" Value="Shirt" />
<Key Name="assetType" Value="5" />
<Key Name="inventoryType" Value="18" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Pants">
<Key Name="inventoryID" Value="d5e46211-b9d1-11dc-95ff-0800200c9a66" />
<Key Name="assetID" Value="00000000-38f9-1111-024e-222222111120" />
@ -37,10 +30,7 @@
<Key Name="name" Value="Pants" />
<Key Name="assetType" Value="5" />
<Key Name="inventoryType" Value="18" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
</Nini>

80
bin/inventory/GesturesLibrary/GesturesLibraryItems.xml
View File

@ -7,11 +7,8 @@
<Key Name="name" Value="can we move along?" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="me!">
<Key Name="inventoryID" Value="4c141851-1bef-4c00-9058-8c4d97ab48fe"/>
<Key Name="assetID" Value="652475bc-ffb7-4a18-b6bb-7731ddeb6a51"/>
@ -20,11 +17,8 @@
<Key Name="name" Value="me!" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="clap">
<Key Name="inventoryID" Value="a5a30fdb-613f-44fa-8bc2-7806e4da67f6"/>
<Key Name="assetID" Value="712e81fd-a215-498c-ab1a-caf1f5bf950d"/>
@ -33,11 +27,8 @@
<Key Name="name" Value="clap" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="no">
<Key Name="inventoryID" Value="514b3ca6-1571-4f58-a24e-f58eb5cb8460"/>
<Key Name="assetID" Value="6c123970-0f5a-448e-920a-07bae9aadf4c"/>
@ -46,11 +37,8 @@
<Key Name="name" Value="no" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="suprised">
<Key Name="inventoryID" Value="120fb1f3-112b-4bc4-a7d3-a784ecc360af"/>
<Key Name="assetID" Value="dbaf104b-cba8-4df7-b5d3-0cb57d0d63b2"/>
@ -59,11 +47,8 @@
<Key Name="name" Value="suprised" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="dance2">
<Key Name="inventoryID" Value="1ca0e368-5a11-4da1-8503-925a55e7c45f"/>
<Key Name="assetID" Value="3bd1792a-6756-4ee0-a54e-3ae6493c2036"/>
@ -72,11 +57,8 @@
<Key Name="name" Value="dance2" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="definitely YES">
<Key Name="inventoryID" Value="022fa770-abb1-4266-963a-4ece4747b748"/>
<Key Name="assetID" Value="392c292f-3d27-45ff-9437-c79c06699237"/>
@ -85,11 +67,8 @@
<Key Name="name" Value="definitely YES" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="Wave">
<Key Name="inventoryID" Value="6406a7c6-a690-44be-a444-ba723e50c17d"/>
<Key Name="assetID" Value="cce0e317-2c49-411e-8716-f9ce3007c715"/>
@ -98,11 +77,8 @@
<Key Name="name" Value="Wave" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="take it outside">
<Key Name="inventoryID" Value="1488b988-c300-4c2e-b48a-3b8eacb93659"/>
<Key Name="assetID" Value="d082bd28-f655-43b7-a0eb-cb80db03753e"/>
@ -111,11 +87,8 @@
<Key Name="name" Value="take it outside" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="whoohoo!">
<Key Name="inventoryID" Value="18c1a2fc-17f6-4af4-a519-827b272feaac"/>
<Key Name="assetID" Value="7f7384c0-848c-4bf0-8e83-50879981e1a4"/>
@ -124,11 +97,8 @@
<Key Name="name" Value="whoohoo!" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="raise hand">
<Key Name="inventoryID" Value="5c0afacd-bbd0-4f66-a516-4ac4e380853c"/>
<Key Name="assetID" Value="2d0819cf-452b-4db8-b7ac-cda443bc89e7"/>
@ -137,11 +107,8 @@
<Key Name="name" Value="raise hand" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="LOL">
<Key Name="inventoryID" Value="407f6a99-1a12-43c6-bec1-8fad974c8f42"/>
<Key Name="assetID" Value="d545ac78-09cc-4811-8700-8df1a37d7f56"/>
@ -150,11 +117,8 @@
<Key Name="name" Value="LOL" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="dance1">
<Key Name="inventoryID" Value="59cce8ab-5c0c-49be-aa3b-036f05fbd7f4"/>
<Key Name="assetID" Value="9cc5bb24-bacf-44f9-a1d0-d409e6ccfa6c"/>
@ -163,11 +127,8 @@
<Key Name="name" Value="dance1" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="wink!">
<Key Name="inventoryID" Value="ba33e8ab-b816-4ead-9302-c8475deb1845"/>
<Key Name="assetID" Value="67d47cd0-9634-4c99-97db-ddce9bda467c"/>
@ -176,11 +137,8 @@
<Key Name="name" Value="wink!" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="not sure">
<Key Name="inventoryID" Value="02da80eb-cad0-4cd1-9ff7-d3d3dd150fbc"/>
<Key Name="assetID" Value="9bc46cd2-95cb-456d-9070-a4439e42af9e"/>
@ -189,11 +147,8 @@
<Key Name="name" Value="not sure" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
<Section Name="dance3">
<Key Name="inventoryID" Value="05e53736-dacb-4935-a1e9-d9897b35b962"/>
<Key Name="assetID" Value="fd9ad83a-4921-4b6e-8b8e-558556d9f503"/>
@ -202,9 +157,6 @@
<Key Name="name" Value="dance3" />
<Key Name="assetType" Value="21"/>
<Key Name="inventoryType" Value="20"/>
<Key Name="currentPermissions" Value="2147483647"/>
<Key Name="nextPermissions" Value="2147483647"/>
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647"/>
</Section>
</Nini>

4
bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->

14
bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
@ -24,11 +20,8 @@
<Key Name="name" Value="Welcome" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Example notecard">
<Key Name="inventoryID" Value="a170ffc0-b9c7-11dc-95ff-0800200c9a66" />
<Key Name="assetID" Value="8d1ada50-b9c7-11dc-95ff-0800200c9a66" />
@ -37,9 +30,6 @@
<Key Name="name" Value="Example notecard" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
</Nini>

4
bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->

4
bin/inventory/OpenSimLibrary/OpenSimLibrary.xml
View File

@ -10,10 +10,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->

4
bin/inventory/PhotosLibrary/PhotosLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->

223
bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
View File

@ -25,11 +25,8 @@
<Key Name="name" Value="llAbs" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAcos">
<Key Name="inventoryID" Value="6519bf38-b19f-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="6519bf39-b19f-11dc-8314-0800200c9a66" />
@ -38,11 +35,8 @@
<Key Name="name" Value="llAcos" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAddToLandBanList">
<Key Name="inventoryID" Value="7ceba3f0-b1a0-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="7ceba3f1-b1a0-11dc-8314-0800200c9a66" />
@ -51,11 +45,8 @@
<Key Name="name" Value="llAddToLandBanList" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAddToLandPassList">
<Key Name="inventoryID" Value="609047e6-b390-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="609047e7-b390-11dc-8314-0800200c9a66" />
@ -64,11 +55,8 @@
<Key Name="name" Value="llAddToLandPassList" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAdjustSoundVolume">
<Key Name="inventoryID" Value="56df4bcc-b393-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="56df4bcd-b393-11dc-8314-0800200c9a66" />
@ -77,11 +65,8 @@
<Key Name="name" Value="llAdjustSoundVolume" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAllowInventoryDrop">
<Key Name="inventoryID" Value="54d6962c-b394-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="54d6962d-b394-11dc-8314-0800200c9a66" />
@ -90,11 +75,8 @@
<Key Name="name" Value="llAllowInventoryDrop" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAngleBetween">
<Key Name="inventoryID" Value="6b341608-b34e-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="6b341609-b34e-11dc-8314-0800200c9a66" />
@ -103,11 +85,8 @@
<Key Name="name" Value="llAngleBetween" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAsin">
<Key Name="inventoryID" Value="7e7422ec-b425-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="7e7422ed-b425-11dc-8314-0800200c9a66" />
@ -116,11 +95,8 @@
<Key Name="name" Value="llAsin" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAtan2">
<Key Name="inventoryID" Value="7e7422ee-b425-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="7e7422ef-b425-11dc-8314-0800200c9a66" />
@ -129,11 +105,8 @@
<Key Name="name" Value="llAtan2" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llApplyImpulse">
<Key Name="inventoryID" Value="714ec678-b419-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="714ec679-b419-11dc-8314-0800200c9a66" />
@ -142,11 +115,8 @@
<Key Name="name" Value="llApplyImpulse" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llAvatarOnSitTarget">
<Key Name="inventoryID" Value="579fc820-b426-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="579fc821-b426-11dc-8314-0800200c9a66" />
@ -155,11 +125,8 @@
<Key Name="name" Value="llAvatarOnSitTarget" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<!-- B == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba004"/> -->
<Section Name="llBase64ToString">
<Key Name="inventoryID" Value="1d4c71d8-b428-11dc-8314-0800200c9a66" />
@ -169,11 +136,8 @@
<Key Name="name" Value="llBase64ToString" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<!-- C == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba005"/> -->
<!-- D == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba006"/> -->
<!-- E == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba007"/> -->
@ -187,6 +151,7 @@
<!-- O == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba015"/> -->
<!-- P == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba016"/> -->
<!-- R == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba017"/> -->
<Section Name="llRemoveFromLandBanList">
<Key Name="inventoryID" Value="299b2100-b392-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="299b2101-b392-11dc-8314-0800200c9a66" />
@ -195,11 +160,8 @@
<Key Name="name" Value="llRemoveFromLandBanList" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llRemoveFromLandPassList">
<Key Name="inventoryID" Value="299b2102-b392-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="299b2103-b392-11dc-8314-0800200c9a66" />
@ -208,11 +170,8 @@
<Key Name="name" Value="llRemoveFromLandPassList" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llResetLandBanList">
<Key Name="inventoryID" Value="366ac8e6-b391-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="366ac8e7-b391-11dc-8314-0800200c9a66" />
@ -221,11 +180,8 @@
<Key Name="name" Value="llResetLandBanList" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llResetLandPassList">
<Key Name="inventoryID" Value="366ac8e8-b391-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="366ac8e9-b391-11dc-8314-0800200c9a66" />
@ -234,11 +190,8 @@
<Key Name="name" Value="llResetLandPassList" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<!-- S == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba018"/> -->
<Section Name="llSay">
<Key Name="inventoryID" Value="3af51d20-b38f-11dc-8314-0800200c9a66" />
@ -248,11 +201,8 @@
<Key Name="name" Value="llSay" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llSetParcelMusicURL">
<Key Name="inventoryID" Value="3603a4f9-b360-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="3603a4f8-b360-11dc-8314-0800200c9a66" />
@ -261,11 +211,8 @@
<Key Name="name" Value="llSetParcelMusicURL" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="llSetRot">
<Key Name="inventoryID" Value="220baef8-b376-11dc-8314-0800200c9a66" />
<Key Name="assetID" Value="220baef9-b376-11dc-8314-0800200c9a66" />
@ -274,11 +221,8 @@
<Key Name="name" Value="llSetRot" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<!-- T == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba019"/> -->
<!-- U == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba020"/> -->
<!-- V == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba021"/> -->
@ -288,213 +232,166 @@
<Section Name="Kan-Ed Test1">
<Key Name="inventoryID" Value="42b6ac70-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac70-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test1" />
<Key Name="name" Value="Kan-Ed Test1" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test2">
<Key Name="inventoryID" Value="42b6ac71-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac71-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test2" />
<Key Name="name" Value="Kan-Ed Test2" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test3">
<Key Name="inventoryID" Value="42b6ac72-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac72-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test3" />
<Key Name="name" Value="Kan-Ed Test3" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test4">
<Key Name="inventoryID" Value="42b6ac73-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac73-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test4" />
<Key Name="name" Value="Kan-Ed Test4" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test5">
<Key Name="inventoryID" Value="42b6ac74-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac74-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test5" />
<Key Name="name" Value="Kan-Ed Test5" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test6">
<Key Name="inventoryID" Value="42b6ac75-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac75-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test6" />
<Key Name="name" Value="Kan-Ed Test6" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test7">
<Key Name="inventoryID" Value="42b6ac76-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac76-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test7" />
<Key Name="name" Value="Kan-Ed Test7" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test8">
<Key Name="inventoryID" Value="42b6ac77-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac77-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test8" />
<Key Name="name" Value="Kan-Ed Test8" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test9">
<Key Name="inventoryID" Value="42b6ac78-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac78-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test9" />
<Key Name="name" Value="Kan-Ed Test9" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test10">
<Key Name="inventoryID" Value="42b6ac79-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac79-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test10" />
<Key Name="name" Value="Kan-Ed Test10" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test11">
<Key Name="inventoryID" Value="42b6ac7a-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac7a-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test11" />
<Key Name="name" Value="Kan-Ed Test11" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test12">
<Key Name="inventoryID" Value="42b6ac7b-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac7b-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test12" />
<Key Name="name" Value="Kan-Ed Test12" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test13">
<Key Name="inventoryID" Value="42b6ac7c-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac7c-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test13" />
<Key Name="name" Value="Kan-Ed Test13" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test14">
<Key Name="inventoryID" Value="42b6ac7d-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac7d-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test14" />
<Key Name="name" Value="Kan-Ed Test14" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test15">
<Key Name="inventoryID" Value="42b6ac7e-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac7e-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test15" />
<Key Name="name" Value="Kan-Ed Test15" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="Kan-Ed Test16">
<Key Name="inventoryID" Value="42b6ac7f-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="assetID" Value="42b6ac7f-d21f-11dd-ad8b-0800200c9a66" />
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="folderID" Value="30000112-000f-0000-0000-000100bba024"/>
<Key Name="description" Value="Kan-Ed Test16" />
<Key Name="name" Value="Kan-Ed Test16" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<!-- .Other testing scripts == <Key Name="folderID" Value="30000112-000f-0000-0000-000100bba025"/> -->
<!-- OpenSim Specific Scripts == <Key Name="folderID" Value="284858c8-9391-6bf1-ddf5-b936f73de853"/> -->
<Section Name="osTextBoard">
<Key Name="inventoryID" Value="2ddcb059-20c5-d169-4c42-673f16d3284b" />
<Key Name="assetID" Value="2ddcb059-20c5-d169-4c42-673f16d3284b" />
@ -503,11 +400,8 @@
<Key Name="name" Value="osTextBoard" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="osWeatherMap">
<Key Name="inventoryID" Value="d63ad3ec-b687-6c38-410d-31ba3e50ce4d" />
<Key Name="assetID" Value="d63ad3ec-b687-6c38-410d-31ba3e50ce4d" />
@ -516,11 +410,8 @@
<Key Name="name" Value="osWeatherMap" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
<Section Name="GrafittiBoard">
<Key Name="inventoryID" Value="81305ee4-8caa-9e0a-69a4-76ed57df0c8f" />
<Key Name="assetID" Value="81305ee4-8caa-9e0a-69a4-76ed57df0c8f" />
@ -529,9 +420,5 @@
<Key Name="name" Value="GrafittiBoard" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
<Key Name="currentPermissions" Value="257487132" />
<Key Name="nextPermissions" Value="257487132" />
<Key Name="everyonePermissions" Value="257487132" />
<Key Name="basePermissions" Value="257487132" />
</Section>
</Nini>

4
bin/inventory/SoundsLibrary/SoundsLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->

274
bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
View File

@ -9,10 +9,6 @@
<Key Name="name" Value="Example Library Item" />
<Key Name="assetType" Value="7" />
<Key Name="inventoryType" Value="7" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
-->
@ -24,11 +20,8 @@
<Key Name="name" Value="4-tile2" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="4-tile3 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001001" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001001" />
@ -37,11 +30,8 @@
<Key Name="name" Value="4-tile3" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="brick1_256 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001002" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001002" />
@ -50,11 +40,8 @@
<Key Name="name" Value="brick1_256" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="brick2_256 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001003" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001003" />
@ -63,11 +50,8 @@
<Key Name="name" Value="brick2_256" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="brick_mono Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001004" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001004" />
@ -76,11 +60,8 @@
<Key Name="name" Value="brick_mono" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="cedar Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001005" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001005" />
@ -89,11 +70,8 @@
<Key Name="name" Value="cedar" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="cement_block Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001006" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001006" />
@ -102,11 +80,8 @@
<Key Name="name" Value="cement_block" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="clear Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001007" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001007" />
@ -115,11 +90,8 @@
<Key Name="name" Value="clear" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="cobbles Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001008" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001008" />
@ -128,11 +100,8 @@
<Key Name="name" Value="cobbles" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="creambrick Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001009" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001009" />
@ -141,11 +110,8 @@
<Key Name="name" Value="creambrick" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="fgrass Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001010" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001010" />
@ -154,11 +120,8 @@
<Key Name="name" Value="fgrass" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="glasstile2 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001011" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001011" />
@ -167,11 +130,8 @@
<Key Name="name" Value="glasstile2" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="graniteblock Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001012" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001012" />
@ -180,11 +140,8 @@
<Key Name="name" Value="graniteblock" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="grass Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001013" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001013" />
@ -193,11 +150,8 @@
<Key Name="name" Value="grass" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="gravel Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001014" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001014" />
@ -206,11 +160,8 @@
<Key Name="name" Value="gravel" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="greybrick Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001015" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001015" />
@ -219,11 +170,8 @@
<Key Name="name" Value="greybrick" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="ivy Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001016" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001016" />
@ -232,11 +180,8 @@
<Key Name="name" Value="ivy" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="mahogany Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001017" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001017" />
@ -245,11 +190,8 @@
<Key Name="name" Value="mahogany" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="maple Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001018" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001018" />
@ -258,11 +200,8 @@
<Key Name="name" Value="maple" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="mosaic02 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001019" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001019" />
@ -271,11 +210,8 @@
<Key Name="name" Value="mosaic02" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="palm1 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001020" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001020" />
@ -284,11 +220,8 @@
<Key Name="name" Value="palm1" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="papaya Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001021" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001021" />
@ -297,11 +230,8 @@
<Key Name="name" Value="papaya" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="papaya_bark Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001022" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001022" />
@ -310,11 +240,8 @@
<Key Name="name" Value="papaya_bark" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="pastelbrick Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001023" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001023" />
@ -323,11 +250,8 @@
<Key Name="name" Value="pastelbrick" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="pine1_10m Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001024" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001024" />
@ -336,11 +260,8 @@
<Key Name="name" Value="pine1_10m" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="poplar Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001025" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001025" />
@ -349,11 +270,8 @@
<Key Name="name" Value="poplar" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="redtri_tile Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001026" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001026" />
@ -362,11 +280,8 @@
<Key Name="name" Value="redtri_tile" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rockbuilding Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001027" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001027" />
@ -375,11 +290,8 @@
<Key Name="name" Value="rockbuilding" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rockwallbig Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001028" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001028" />
@ -388,11 +300,8 @@
<Key Name="name" Value="rockwallbig" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="roof01 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001029" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001029" />
@ -401,11 +310,8 @@
<Key Name="name" Value="roof01" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rooftiles1 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001030" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001030" />
@ -414,11 +320,8 @@
<Key Name="name" Value="rooftiles1" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rooftiles2_peach Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001031" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001031" />
@ -427,11 +330,8 @@
<Key Name="name" Value="rooftiles2_peach" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rooftiles2_roy Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001032" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001032" />
@ -440,11 +340,8 @@
<Key Name="name" Value="rooftiles2_roy" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="saguaro_8m Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001033" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001033" />
@ -453,11 +350,8 @@
<Key Name="name" Value="saguaro_8m" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="seawater Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001034" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001034" />
@ -466,11 +360,8 @@
<Key Name="name" Value="seawater" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="snow1 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001035" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001035" />
@ -479,11 +370,8 @@
<Key Name="name" Value="snow1" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="steel Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001036" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001036" />
@ -492,11 +380,8 @@
<Key Name="name" Value="steel" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="stone1wall Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001037" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001037" />
@ -505,11 +390,8 @@
<Key Name="name" Value="stone1wall" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="stonetile Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001038" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001038" />
@ -518,11 +400,8 @@
<Key Name="name" Value="stonetile" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="street2 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001039" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001039" />
@ -531,11 +410,8 @@
<Key Name="name" Value="street2" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="thatch Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001040" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001040" />
@ -544,11 +420,8 @@
<Key Name="name" Value="thatch" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="water1 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001041" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001041" />
@ -557,11 +430,8 @@
<Key Name="name" Value="water1" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="water3 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001042" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001042" />
@ -570,11 +440,8 @@
<Key Name="name" Value="water3" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="wood1 Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-4444-100000001043" />
<Key Name="assetID" Value="00000000-0000-2222-3333-100000001043" />
@ -583,11 +450,8 @@
<Key Name="name" Value="wood1" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="bricks Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000001"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000001"/>
@ -596,11 +460,8 @@
<Key Name="name" Value="bricks" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="granite Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000004"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000004"/>
@ -609,11 +470,8 @@
<Key Name="name" Value="granite" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="hardwood Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000005"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000005"/>
@ -622,11 +480,8 @@
<Key Name="name" Value="hardwood" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="rocks Texture">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000003"/>
<Key Name="assetID" Value="00000000-0000-1111-9999-000000000003"/>
@ -635,10 +490,6 @@
<Key Name="name" Value="rocks" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Terrain Dirt">
@ -649,11 +500,8 @@
<Key Name="name" Value="Terrain Dirt" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Terrain Grass">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000007"/>
<Key Name="assetID" Value="abb783e6-3e93-26c0-248a-247666855da3"/>
@ -662,11 +510,8 @@
<Key Name="name" Value="Terrain Grass" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Terrain Mountain">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000008"/>
<Key Name="assetID" Value="179cdabd-398a-9b6b-1391-4dc333ba321f"/>
@ -675,11 +520,8 @@
<Key Name="name" Value="Terrain Mountain" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Terrain Rock">
<Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000009"/>
<Key Name="assetID" Value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/>
@ -688,10 +530,6 @@
<Key Name="name" Value="Terrain Rock" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Blank Texture">
@ -702,10 +540,6 @@
<Key Name="name" Value="Blank Texture" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Default Media Texture">
@ -716,10 +550,6 @@
<Key Name="name" Value="Default Media Texture" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
<Section Name="Default Transparent Texture">
@ -730,9 +560,5 @@
<Key Name="name" Value="Default Transparent Texture" />
<Key Name="assetType" Value="0" />
<Key Name="inventoryType" Value="0" />
<Key Name="currentPermissions" Value="2147483647" />
<Key Name="nextPermissions" Value="2147483647" />
<Key Name="everyonePermissions" Value="2147483647" />
<Key Name="basePermissions" Value="2147483647" />
</Section>
</Nini>

BIN
bin/protobuf-net.pdb
View File

Binary file not shown.