Melanie
d3892bbd06
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1f1da23097
Bump version and assembly version numbers from 0.7.5 to 0.7.6
...
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
Melanie
cc4cfd9fa8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
2013-01-23 02:38:59 +00:00
Oren Hurvitz
b77da5039e
Assign the SmartThreadPool name in the constructor
...
This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
2013-01-19 02:08:58 +00:00
Melanie
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
Diva Canto
e4cb7af98a
Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.
2012-11-13 19:26:43 -08:00
Tom Grimshaw
ae7c30a0f3
While examining our 10,10,10 issue I discovered that several threads were locked with each other in an unusual place; I've moved the piece of code inside a lock[] context and so far it's looking promising.
2010-05-18 00:07:17 -07:00
John Hurliman
2f394b7e7e
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)
...
* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 01:30:12 -07:00
lbsa71
5af465a364
* Changed all AssemblyInfo to explicit version 1.0.0.0 to not confuse poor poor Nant. We probably should take the opportunity to let the non-module bins reside in their /bin/Debug dirs later.
2009-02-19 14:51:33 +00:00
Mike Mazur
fefe0ff3d9
Removing contents of ThirdParty/3Di. The load balancer can now be found
...
at http://forge.opensimulator.org/gf/project/loadbalancer/
config key: svn.rmdir
2009-01-28 01:56:04 +00:00
Justin Clarke Casey
18ba6c3510
* minor: A few tiny bits of documentation and log message cleanup before starting something different
2008-12-01 20:28:00 +00:00
lbsa71
8388fe0669
* some if inversions and added {}'s for readability
2008-09-08 14:30:35 +00:00
Teravus Ovares
7d89e12293
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
...
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
2008-09-06 07:52:41 +00:00
Mike Mazur
c74f7387ec
Correctly convert port to int.
2008-08-19 09:24:15 +00:00
Mike Mazur
894f3045ed
Convert LoadBalancer and RegionProxy plugins to use XML manifests. Fixes
...
"Plugin Error: Node 'Type' not allowed" messages during region server startup.
2008-08-19 09:24:12 +00:00
Melanie Thielker
eaff580abe
Patch #9160
...
Refactor proxy encode/decode methods out of the PacketPool into
their own class.
2008-08-08 11:04:24 +00:00
Mike Mazur
15669281fa
Apply updated patch from issue 1871. Thanks sempuki.
2008-07-31 23:53:24 +00:00
Johan Berntsson
337a46474a
Updated files for the loadbalancer web interface
2008-07-16 03:04:45 +00:00
Dr Scofield
748f72326d
last round of warning squashing. calling it a day now.
2008-06-27 23:03:39 +00:00
Charles Krinke
ca8d1d57e1
Mantis#1591. Thank you graciously, Sempuki for a patch that:
...
Currently module loading is done ad-hoc. I propose creating a simple
loader class that leverages Mono.Addins (and perhaps the new .NET
addins when they become available in mono). Attached is a basic
patch for review that compiles into HEAD, but doesn't yet replace
any existing ad-hoc loaders.
2008-06-27 02:15:57 +00:00
MW
314181a70d
small change to last commit
2008-06-26 17:23:05 +00:00
MW
682ec53420
As per the suggestion on the mailing list, added support for a OpenSim.xml config file, instead of a ini file. INI files still work the same as they did before, just now if a ini file isn't found, it looks for a OpenSim.xml file (of course in xml format) and if found uses that.
...
Includes a OpenSim.Example.xml for reference (the default settings saved as a xml file).
2008-06-26 17:20:08 +00:00
Johan Berntsson
20e4036853
Implemented plugin support for ClientStack, with LindenUDP as the default plugin. This makes it easy for developers to experiment with alternative communication protocols
2008-06-20 01:35:54 +00:00
Justin Clarke Casey
8e1d338656
* Refactor: Split opensim background server into a separate class
2008-06-01 01:01:16 +00:00
Teravus Ovares
1a47ff8094
* This is Melanie's XEngine script engine. I've not tested this real well, however, it's confirmed to compile and OpenSimulator to run successfully without this script engine active.
2008-05-30 12:27:06 +00:00
Jeff Ames
9040213366
Set svn:ignore. Minor formatting cleanup.
2008-05-16 05:30:39 +00:00
Justin Clarke Casey
8fe9943293
From: Dr Schofield <hud@zurich.ibm.com>
...
Rename SearializableRegionInfo to SerializableRegionInfo (class was already named correctly)
2008-05-14 17:03:25 +00:00
Jeff Ames
b7a0855c3a
More formatting cleanup. Minor refactoring.
2008-05-14 06:09:39 +00:00
Jeff Ames
6a1b787436
More formatting cleanup.
2008-05-14 05:33:32 +00:00
Jeff Ames
c995d60d37
Formatting cleanup.
2008-05-14 05:11:23 +00:00
Justin Clarke Casey
b4d128c811
From: Alan M Webb <awebb@vnet.ibm.com>
...
This patch just tightens up console handling in BasOpenSimServer
and removes (or redirects) a couple of messages that were being issued
using Console.Writeline.
2008-05-12 13:39:46 +00:00
Adam Frisby
872af8e04d
* Reduced major-ass ugly code in LoadBalancer/TcpClient.cs
...
* Still more needs to be done.
2008-05-08 05:18:38 +00:00
Adam Frisby
80cbd468ea
* Some refactorings.
...
* Added shell of new Python scripting engine. Similar in design to the one used by Rex, but will be structured at a region rather than object level, also is a region module.
2008-05-08 04:34:02 +00:00
Adam Frisby
9485b52f97
* Made 3Di LoadBalancerPlugin compatible with recent IClientNetworkServer changes.
...
* It's slightly hackish in that it will not work with another client type, but LoadBalancerPlugin is very dependent on the LL Architecture and is unlikely to be useful with a different protocol anyway.
2008-05-03 19:38:03 +00:00
Adam Frisby
dcf004aa0d
* Refactoring and major cleaning work done on 3Di's LoadBalancerPlugin - Johan, if you are still around, please shoot me a message.
2008-05-03 19:33:59 +00:00
Adam Frisby
67bbfadc06
* More refactorings of UDPServer.
...
* Removed all references where possible.
* Renamed lots of variables from UDPServerXYZ to clientServerXYZ
2008-05-02 18:26:19 +00:00
Adam Frisby
cfc62d6252
* Commit 3/3 - Please test this revision.
2008-05-02 16:41:35 +00:00
Adam Frisby
76d8eaa406
* Thanks to Mic Bowman for inspiring me to look at that we are still using ASCIIEncoder in places we shouldn't.
2008-05-01 18:50:44 +00:00
Adam Frisby
20a9bf08f5
* Rolled back a few changes.
2008-05-01 18:04:42 +00:00
Adam Frisby
fc6c4dc399
* Cleaning code still.
2008-05-01 16:41:01 +00:00
Adam Frisby
01f31fd933
* Breaking all the code, breaking all the code..!
...
* Made a bunch more members static, removed some dead code, general cleaning.
2008-05-01 16:23:53 +00:00
Adam Frisby
de2ff8e626
* Little more spring cleaning.
2008-04-29 14:10:26 +00:00
Adam Frisby
01663cb612
* Committing fix for previous build breakage. Sorry!
...
* Committing namespace/usings fixes for ThirdParty directory, missed in previous commit.
2008-04-21 07:16:30 +00:00
Johan Berntsson
39f340e687
XmlRpcCommand refactoring
2008-03-24 01:37:00 +00:00
lbsa71
24aedf52c6
* Added null root part guard
...
* Normalized some UUID handling
* Compacted a few Contains/Add into Set
2008-03-14 15:28:34 +00:00
Johan Berntsson
f0bfb87979
Eliminated several compiler warning messages
2008-03-11 04:40:39 +00:00
Johan Berntsson
bec947cde3
The plugin loader can now handle plugin dependencies without hardcoding
2008-03-11 03:10:21 +00:00
Johan Berntsson
9ef044727e
this fixes a port initialization problem in the LoadBalancer plugin
2008-03-11 02:49:44 +00:00
Adam Frisby
4d9ed39444
* Four more warnings bite the dust.
2008-03-05 21:50:58 +00:00
Jeff Ames
d2806090ae
Cleaned up a couple compiler warnings.
2008-03-04 10:12:39 +00:00