diff options
| author | Robert Adams | 2013-10-07 13:58:17 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-10-07 13:58:17 -0700 |
| commit | 86bf79aa2b60ab33042fc078a177ad3cdaa62e01 (patch) | |
| tree | a123b39f20170798a74edf3009aaf6235e003a46 /OpenSim/Region/Physics | |
| parent | varregion: plug in TerrainData class and modify TerrainModule and LLClientVie... (diff) | |
| parent | * Added a unique and interesting WebSocket grid login processor by hijacking ... (diff) | |
| download | opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.zip opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.gz opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.bz2 opensim-SC_OLD-86bf79aa2b60ab33042fc078a177ad3cdaa62e01.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Physics')
7 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs index 6fd6f7e..ffcb01e 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs | |||
| @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
| 55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
| 56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
| 57 | 57 | ||
| 58 | [assembly : AssemblyVersion("0.7.6.*")] | 58 | [assembly : AssemblyVersion("0.8.0.*")] |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs index 02b03a8..d069178 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/Properties/AssemblyInfo.cs | |||
| @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
| 29 | // Build Number | 29 | // Build Number |
| 30 | // Revision | 30 | // Revision |
| 31 | // | 31 | // |
| 32 | [assembly: AssemblyVersion("0.7.6.*")] | 32 | [assembly: AssemblyVersion("0.8.0.*")] |
| 33 | 33 | ||
diff --git a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs index f611b9a..b8cf624 100644 --- a/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | |||
| @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; | |||
| 32 | // You can specify all the values or you can default the Build and Revision Numbers | 32 | // You can specify all the values or you can default the Build and Revision Numbers |
| 33 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
| 34 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
| 35 | [assembly: AssemblyVersion("0.7.6.*")] | 35 | [assembly: AssemblyVersion("0.8.0.*")] |
| 36 | 36 | ||
diff --git a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs index 5da3956..10e850e 100644 --- a/OpenSim/Region/Physics/Manager/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/Manager/AssemblyInfo.cs | |||
| @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
| 55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
| 56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
| 57 | 57 | ||
| 58 | [assembly : AssemblyVersion("0.7.6.*")] | 58 | [assembly : AssemblyVersion("0.8.0.*")] |
diff --git a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs index 3de061a..8542753 100644 --- a/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/Meshing/Properties/AssemblyInfo.cs | |||
| @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
| 29 | // Build Number | 29 | // Build Number |
| 30 | // Revision | 30 | // Revision |
| 31 | // | 31 | // |
| 32 | [assembly: AssemblyVersion("0.7.6.*")] | 32 | [assembly: AssemblyVersion("0.8.0.*")] |
| 33 | 33 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs index f477ed1..288cab5 100644 --- a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs | |||
| @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
| 55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
| 56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
| 57 | 57 | ||
| 58 | [assembly : AssemblyVersion("0.7.6.*")] | 58 | [assembly : AssemblyVersion("0.8.0.*")] |
diff --git a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs index 4289863..83be103 100644 --- a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs | |||
| @@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
| 55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
| 56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
| 57 | 57 | ||
| 58 | [assembly : AssemblyVersion("0.7.6.*")] | 58 | [assembly : AssemblyVersion("0.8.0.*")] |