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

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-12-21 15:02:57 +00:00
parent d8d6e8a304 1e55d74c5c
commit b891291135
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -171,6 +171,7 @@ namespace OpenSim.Framework.Communications.Cache
item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF); item.NextPermissions = (uint)config.GetLong("nextPermissions", 0x7FFFFFFF);
item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF); item.EveryOnePermissions = (uint)config.GetLong("everyonePermissions", 0x7FFFFFFF);
item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF); item.BasePermissions = (uint)config.GetLong("basePermissions", 0x7FFFFFFF);
item.Flags = (uint)config.GetInt("flags", 0);
if (libraryFolders.ContainsKey(item.Folder)) if (libraryFolders.ContainsKey(item.Folder))
{ {

40
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@ -258,26 +258,50 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
public Vector3 SitTarget public Vector3 SitTarget
{ {
get { throw new System.NotImplementedException(); } get { return GetSOP().SitTargetPosition; }
set { throw new System.NotImplementedException(); } set
{
if (CanEdit())
{
GetSOP().SitTargetPosition = value;
}
}
} }
public string SitTargetText public string SitTargetText
{ {
get { throw new System.NotImplementedException(); } get { return GetSOP().SitName; }
set { throw new System.NotImplementedException(); } set
{
if (CanEdit())
{
GetSOP().SitName = value;
}
}
} }
public string TouchText public string TouchText
{ {
get { throw new System.NotImplementedException(); } get { return GetSOP().TouchName; }
set { throw new System.NotImplementedException(); } set
{
if (CanEdit())
{
GetSOP().TouchName = value;
}
}
} }
public string Text public string Text
{ {
get { throw new System.NotImplementedException(); } get { return GetSOP().Text; }
set { throw new System.NotImplementedException(); } set
{
if (CanEdit())
{
GetSOP().SetText(value,new Vector3(1.0f,1.0f,1.0f),1.0f);
}
}
} }
public bool IsRotationLockedX public bool IsRotationLockedX