ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging Opensim upstream before generating patch

Browse Source
This commit is contained in:
Michael Heilmann
2015-05-19 15:18:45 -04:00
parent 714c082ca8 6a48c87cd2
commit 140ea04b9d
136 changed files with 32587 additions and 18424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1334
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

File diff suppressed because it is too large Load Diff

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: AssemblyVersion("0.8.2.*")]

4
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@@ -596,6 +596,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int OBJECT_PHYSICS = 21;
public const int OBJECT_PHANTOM = 22;
public const int OBJECT_TEMP_ON_REZ = 23;
public const int OBJECT_RENDER_WEIGHT = 24;
public const int OBJECT_HOVER_HEIGHT = 25;
public const int OBJECT_BODY_SHAPE_TYPE = 26;
public const int OBJECT_LAST_OWNER_ID = 27;
// Pathfinding types
public const int OPT_OTHER = -1;

2
OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: AssemblyVersion("0.8.2.*")]

2
OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: AssemblyVersion("0.8.2.*")]

2
OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
View File

@@ -30,7 +30,7 @@ using Mono.Addins;
// Build Number
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
[assembly: AssemblyVersion("0.8.2.*")]
[assembly: Addin("OpenSim.Region.ScriptEngine.XEngine", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]