Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-04-01 07:44:43 +0100
committer: Melanie 2011-04-01 07:44:43 +0100
commit: 329fa73695b496a30e9192888371855802769a16 (patch)
tree: f581712c3317119b70005beecbe7e4a8d86fb6bc /OpenSim/Region/OptionalModules/Scripting
parent: Make the login service's call to the sim time out quicker so we have a (diff)
parent: When a new parcel is created, make sure the prim counts are updated. (diff)
download: opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.zip
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.gz
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.bz2
opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
index 8df020f..c898da6 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
@@ -25,6 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
author	Melanie	2011-04-01 07:44:43 +0100
committer	Melanie	2011-04-01 07:44:43 +0100
commit	329fa73695b496a30e9192888371855802769a16 (patch)
tree	f581712c3317119b70005beecbe7e4a8d86fb6bc /OpenSim/Region/OptionalModules/Scripting
parent	Make the login service's call to the sim time out quicker so we have a (diff)
parent	When a new parcel is created, make sure the prim counts are updated. (diff)
download	opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.zip opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.gz opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.bz2 opensim-SC_OLD-329fa73695b496a30e9192888371855802769a16.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs index 8df020f..c898da6 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/LOParcel.cs
@@ -25,6 +25,7 @@
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
		28	using OpenSim.Framework;
28	using OpenSim.Region.Framework.Interfaces;	29	using OpenSim.Region.Framework.Interfaces;
29	using OpenSim.Region.Framework.Scenes;	30	using OpenSim.Region.Framework.Scenes;
30		31