Merging Opensim upstream before generating patch

author: Michael Heilmann 2015-05-19 15:18:45 -0400
committer: Michael Heilmann 2015-05-19 15:18:45 -0400
commit: 140ea04b9d692344d803fc87364fb252561725c3 (patch)
tree: d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/ApplicationPlugins
parent: Merge pull request #7 from gamucf/moses.metricsPhase2 (diff)
parent: resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff)
download: opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.zip
opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.gz
opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2
opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.xz
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
index 0ed47a3..6c3c3e3 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
@@ -63,7 +63,7 @@ using Mono.Addins;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("0.7.6.*")]
-[assembly : AssemblyVersion("0.8.1.*")]
+[assembly : AssemblyVersion("0.8.2.*")]
 [assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
index d14938f..021209f 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.1.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 [assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
index ffeff3a..443e323 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.1.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 [assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]
author	Michael Heilmann	2015-05-19 15:18:45 -0400
committer	Michael Heilmann	2015-05-19 15:18:45 -0400
commit	140ea04b9d692344d803fc87364fb252561725c3 (patch)
tree	d503b7ae17baca374d704b548fc7da512f512388 /OpenSim/ApplicationPlugins
parent	Merge pull request #7 from gamucf/moses.metricsPhase2 (diff)
parent	resolve possible nullref when sending appearance packet. Thanks to zadark for... (diff)
download	opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.zip opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.gz opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.bz2 opensim-SC-140ea04b9d692344d803fc87364fb252561725c3.tar.xz

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index 0ed47a3..6c3c3e3 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
@@ -63,7 +63,7 @@ using Mono.Addins;
63	// by using the '*' as shown below:	63	// by using the '*' as shown below:
64	// [assembly: AssemblyVersion("0.7.6.*")]	64	// [assembly: AssemblyVersion("0.7.6.*")]
65		65
66	[assembly : AssemblyVersion("0.8.1.*")]	66	[assembly : AssemblyVersion("0.8.2.*")]
67		67
68	[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VersionNumber)]	68	[assembly: Addin("OpenSim.ApplicationPlugins.LoadRegions", OpenSim.VersionInfo.VersionNumber)]
69	[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]	69	[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]


diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs index d14938f..021209f 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
30	// Build Number	30	// Build Number
31	// Revision	31	// Revision
32	//	32	//
33	[assembly: AssemblyVersion("0.8.1.*")]	33	[assembly: AssemblyVersion("0.8.2.*")]
34		34
35	[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)]	35	[assembly: Addin("OpenSim.ApplicationPlugins.RegionModulesController", OpenSim.VersionInfo.VersionNumber)]
36	[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]	36	[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]


diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs index ffeff3a..443e323 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@ using Mono.Addins;
30	// Build Number	30	// Build Number
31	// Revision	31	// Revision
32	//	32	//
33	[assembly: AssemblyVersion("0.8.1.*")]	33	[assembly: AssemblyVersion("0.8.2.*")]
34		34
35	[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VersionNumber)]	35	[assembly: Addin("OpenSim.ApplicationPlugins.RemoteController", OpenSim.VersionInfo.VersionNumber)]
36	[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]	36	[assembly: AddinDependency("OpenSim", OpenSim.VersionInfo.VersionNumber)]