aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-141-0/+20
|\
| * * Implements OSSL function: osGetSimulatorMemory - returns the current ↵Adam Frisby2009-12-131-0/+20
| | | | | | | | | | | | | | | | amount of memory allocated to the simulator process (Moderate Threat Level). * Cleans redundant information out of the Simulator Version. Versions now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log info for MySQLInventoryData
* | And reverseMelanie2009-12-121-1/+1
| |
* | Another whitespace test commitMelanie2009-12-121-1/+1
| |
* | Reverse test commit (again)Melanie2009-12-121-1/+1
| |
* | Another testMelanie2009-12-121-1/+1
| |
* | Reverse text commit whitespace changeMelanie2009-12-121-1/+0
| |
* | test commitMelanie2009-12-121-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2009-12-122-234/+149
|\ \ | |/
| * Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-122-465/+147
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2009-12-1214-1337/+16
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-122-2/+16
| |\
| | * A couple of more sanity guards, but this won't fix things when user profile ↵Diva Canto2009-12-111-1/+1
| | | | | | | | | | | | fetching is borked.
| | * Fix to make [bad] tests happy.Diva Canto2009-12-111-4/+4
| | |
| | * Attempt at fixing mantis #4411.Diva Canto2009-12-111-1/+15
| | |
| * | Getting rid of a bunch of old classes, that are likely left over from the ↵Kunnis2009-12-1212-1335/+0
| |/ | | | | | | | | | | ROBUST change. Signed-off-by: Melanie <melanie@t-data.com>
* | Fix version numberMelanie2009-12-101-4/+3
| |
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-101-4/+4
|\ \ | | | | | | | | | careminster
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-051-4/+4
| | | | | | | | | | | | spammy debug messages in Interregion....
* | | Merge branch 'careminster' into windlightunknown2009-12-077-42/+51
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2009-12-073-13/+0
| |\ \ \ | | | |/ | | |/|
| | * | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ↵Kunnis2009-12-063-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | not even stored in mysql. Signed-off-by: Melanie <melanie@t-data.com>
| * | | Fix to existing ReaderWriterLockSlim implementationsCasperW2009-12-061-2/+8
| | | |
| * | | Merge branch 'master' into careminsterMelanie2009-12-052-3/+19
| |\ \ \ | | |/ /
| | * | * Fix line endings in BaseHttpServer.csTeravus Ovares (Dan Olivares)2009-12-051-6/+6
| | | |
| | * | if an xml rpc method throws an exception, log as an error to the console as ↵Justin Clark-Casey (justincc)2009-12-031-3/+11
| | | | | | | | | | | | | | | | well as returning the exception to the caller
| | * | handle a condition where the http headers apparently have multiple remote ↵dahlia2009-12-021-1/+9
| | | | | | | | | | | | | | | | ports designated
| * | | Merge branch 'master' into careminsterMelanie2009-12-021-24/+24
| |\ \ \ | | |/ /
| | * | * Fix Inconsistent line ending style in UtilTeravus Ovares (Dan Olivares)2009-12-011-24/+24
| | | |
* | | | Initial windlight codebase commitunknown2009-12-072-3/+68
|/ / /
* | | Merge branch 'master' into careminsterMelanie2009-11-301-1/+25
|\ \ \ | |/ /
| * | * Patch from Misterblue to fix Environment.TickCount for statistics ↵Teravus Ovares (Dan Olivares)2009-11-291-1/+25
| | | | | | | | | | | | | | | | | | purposes. Resolves the wrap-around of the 32 bit uint. * Teravus moved the Environment methods to the Util class
* | | Merge branch 'master' into careminsterMelanie2009-11-281-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Apply patch to reduce git revision text length if running sim directly from ↵Justin Clark-Casey (justincc)2009-11-271-1/+1
| | | | | | | | | | | | | | a git tree See http://opensimulator.org/mantis/view.php?id=4030 Thanks ChrisDown (and Bruce for reporting)
* | Remove OS version crap from about dialogMelanie2009-11-261-13/+13
| |
* | Update CM versionMelanie2009-11-261-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2009-11-261-1/+1
|\ \ | |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-11-263-28/+1
| |\
| * | Bump trunk version number to 0.6.9.Justin Clark-Casey (justincc)2009-11-261-1/+1
| | | | | | | | | | | | This is a place holder name and not necessarily the version number that will be used
* | | Merge branch 'master' into careminsterMelanie2009-11-261-1/+1
|\ \ \ | | |/ | |/|
| * | Remove the old (Remoting) region crossing code. Fix the new code toMelanie2009-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass script state and assembly again properly. Reintroduce respecting tht TrustBinaries flag. Changes the interregion protocol! No version bump because it was broken anyway, so with a version mismatch it will simply stay broken, but not crash. Region corssing still doesn't work because there is still monkey business with both rezzed prims being pushed across a border and attached prims when walking across a border. Teleport is untested by may work.
| * | Remove the old remoting-type interregion code for prim/script crossingMelanie2009-11-262-27/+0
| |/
* | Remove the old remoting-type interregion code for prim/script crossingMelanie2009-11-262-27/+0
| |
* | Merge branch 'master' into careminsterMelanie2009-11-251-3/+5
|\ \ | |/
| * minor: remove some mono compiler warnings, add --merge load oar switch to ↵Justin Clark-Casey (justincc)2009-11-251-3/+5
| | | | | | | | help information
* | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim ↵CasperW2009-11-241-5/+106
|/ | | | | | | | lock handler. This gives us: - Faster prim inventory actions. Multiple threads can read at once. - Fixes the known prim inventory thread locks - In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
* Formatting cleanup.Jeff Ames2009-11-233-4/+58
|
* Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensimdahlia2009-11-201-31/+2
|\
| * minor: correct error messages when queryfolder failsJustin Clark-Casey (justincc)2009-11-181-3/+1
| |
| * minor: remove duplicate copyright notice in PollServiceWorkerThreadJustin Clark-Casey (justincc)2009-11-181-28/+1
| |