aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-151-2/+2
| |\ \ | | |/
| | * Change default grid and inventory service ports in ConfigSettings to the ↵Justin Clark-Casey (justincc)2009-12-151-2/+2
| | | | | | | | | | | | ROBUST default of 8003
| * | Prevent OSSL from crashing if the sim was loaded from a remote config andMelanie2009-12-151-3/+3
| |/ | | | | | | osGetGridName, osGetGridNick or osGetGridLoginURI is used.
| * Make the HG map search recognize host names without ports.Diva Canto2009-12-141-1/+1
| |
* | Merge branch 'master' into testsKitto Flora2009-12-1510-222/+337
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-1410-222/+337
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-149-220/+315
| | |\
| | | * Tweaking the ModifyLand packet to be async. Advice from AdamTeravus Ovares (Dan Olivares)2009-12-131-1/+1
| | | |
| | | * * Add some glue that allows LocalPacketHandlers to decide if they want the ↵Teravus Ovares (Dan Olivares)2009-12-132-48/+90
| | | | | | | | | | | | | | | | | | | | | | | | packet to be processed asynchronously or not. * Make several packets not asynchronous (such as AgentUpdate). In theory, all fast returning packet handling methods should not be asynchronous. Ones that wait on an external resource or a long held lock, should be asynchronous.
| | | * * Mistaken ThreatLevel classification on osGetSimulatorMemory - should have ↵Adam Frisby2009-12-131-1/+1
| | | | | | | | | | | | | | | | been MODERATE.
| | | * * Implements OSSL function: osGetSimulatorMemory - returns the current ↵Adam Frisby2009-12-137-173/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Add an option to exit an instance rather than restarting a region within itMelanie2009-12-142-2/+21
| | |/
| * | And reverseMelanie2009-12-121-1/+1
| | |
| * | Another whitespace test commitMelanie2009-12-121-1/+1
| | |
* | | Removed excessive call to UpdateMovementAnimations which prevented ↵Kitto Flora2009-12-151-25/+23
| | | | | | | | | | | | GroundSit; Corrected cause of 'sit on roof'.
* | | Merge branch 'master' into testsKitto Flora2009-12-120-0/+0
|\ \ \ | |/ /
| * | 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
| | |
* | | Commit partial work because of repo changeKitto Flora2009-12-122-12/+73
|/ /
* | Merge branch 'master' into careminsterMelanie2009-12-123-18/+239
|\ \ | |/
| * * Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."Teravus Ovares (Dan Olivares)2009-12-122-5/+15
| | | | | | | | * Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-12-1222-1842/+247
| |\
| * | * Commit some sit code that's commented out for now.Teravus Ovares (Dan Olivares)2009-12-082-14/+223
| | |
* | | Merge branch 'master' into careminsterMelanie2009-12-123-267/+153
|\ \ \ | | |/ | |/|
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-123-498/+151
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'master' into careminsterMelanie2009-12-1217-1341/+93
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-125-6/+93
| |\ \
| | * | A few more guards along the path to user server.Diva Canto2009-12-111-3/+6
| | | |
| | * | A couple of more sanity guards, but this won't fix things when user profile ↵Diva Canto2009-12-111-1/+1
| | | | | | | | | | | | | | | | fetching is borked.
| | * | Added an image uuid to objects marked "Show in search". Only works for boxes.Diva Canto2009-12-111-0/+70
| | | |
| | * | Fix to make [bad] tests happy.Diva Canto2009-12-111-4/+4
| | | |
| | * | Attempt at fixing mantis #4411.Diva Canto2009-12-112-2/+16
| | | |
| * | | 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>
* | | Merge branch 'master' into careminsterMelanie2009-12-111-1/+1
|\ \ \ | |/ /
| * | Refix the fixMelanie2009-12-111-1/+1
| | |
| * | Kill a NRE caused by an error message trying to print unavailable datagrid2009-12-111-2/+2
| | |
| * | * Diagnosing a connection issue.Adam Frisby2009-12-111-1/+1
| |/
* | Refix the fixMelanie2009-12-111-1/+1
| |
* | Kill a NRE caused by an error message trying to print unavailable datagrid2009-12-101-2/+2
| |
* | Fix version numberMelanie2009-12-101-4/+3
| |
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-105-129/+172
|\ \ | | | | | | | | | careminster
| * | Correct AbsolutePosition calculationKittoFlora2009-12-081-1/+2
| | |
| * | Fix linked physical daughter prim position update.KittoFlora2009-12-062-5/+14
| | |
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-054-122/+156
| | | | | | | | | | | | spammy debug messages in Interregion....
* | | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-099-387/+600
|\ \ \ | | | | | | | | | | | | careminster
| * | | Move osFunctions into a new Careminster script interfaceCasperW2009-12-099-387/+600
| | | |
* | | | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-0924-18/+1047
|\ \ \ \ | |/ / / | | | | | | | | careminster
| * | | Last bits and bobs to clean up the Meta7WindlightModuleCasperW2009-12-092-1/+252
| | | |