aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Added a counter to NewFiles in Xfers to account for simultaneous object ↵Diva Canto2010-12-221-16/+42
| | | | inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-12-220-0/+0
|\
| * Fixed wrong argument cardinality in debug message.Diva Canto2010-12-221-1/+1
| |
* | Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-2/+1
|/ | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere
* * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-219-4/+106
| | | | | | * Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
* What is the point of using different types to express the same damn thing?Melanie2010-12-211-1/+1
|
* Another good catch. Update file name serial.Melanie2010-12-211-0/+1
|
* Added a missed return. Thanks diva!Melanie2010-12-211-0/+1
|
* Fix up merge artifactsMelanie2010-12-211-10/+1
|
* Make prim inventories a bit more saneMelanie2010-12-214-108/+39
|
* Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-202-8/+8
|
* Put the coarse location updates back to 50 frames, otherwise the dots on the ↵Diva Canto2010-12-192-3/+3
| | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
* More changes to the long help text for console command link-region.Marck2010-12-201-3/+3
|
* Fix osTeleportAgent and osTeleportOwner for the case that GridService is ↵Marck2010-12-201-11/+5
| | | | used with a storage provider other than NullRegionData.
* Make long help text for new link-region command syntax more explicit.Marck2010-12-191-1/+1
|
* Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last ↵Diva Canto2010-12-183-2989/+2989
| | | | one was 4.0, and that doesn't work). Also added the corresponding .xml and .pdb, if that makes any difference.
* Replaced HttpServer_OpenSim.dll with a version that locks certain ops in ↵Diva Canto2010-12-181-0/+0
| | | | HttpForm -- mantis #5128.
* uncomment "load iar" help lines which added the --merge optionJustin Clark-Casey (justincc)2010-12-181-5/+3
|
* minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵Justin Clark-Casey (justincc)2010-12-181-3/+3
| | | | console command isn't valid
* Raise maximum iar version that master can load to 1.x, so that it can load ↵Justin Clark-Casey (justincc)2010-12-181-1/+1
| | | | its own iars (oops)
* Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-171-2/+2
|
* remove now unused subversion serialization backup configJustin Clark-Casey (justincc)2010-12-171-12/+3
|
* remove broken and unmaintained subversion serialization module and it's ↵Justin Clark-Casey (justincc)2010-12-1721-1187/+0
| | | | associated libraries and licenses
* remove mono compiler warning: if (sop.Color != null) always returns true as ↵Justin Clark-Casey (justincc)2010-12-171-9/+7
| | | | sop.Color is a value type.
* remove mono compiler warningsJustin Clark-Casey (justincc)2010-12-173-7/+8
|
* minor: 'debug packet' console command level <= 50 then don't log ↵Justin Clark-Casey (justincc)2010-12-172-6/+10
| | | | ImprovedTerseObjectUpdate messages
* tidy up the [Groups] section in OpenSim.ini.exampleJustin Clark-Casey (justincc)2010-12-172-12/+12
|
* Put in locks on m_killRecord to replace changed locks on ↵Justin Clark-Casey (justincc)2010-12-151-193/+200
| | | | | | | m_entityUpdates.SyncRoot These locks are necessary to avoid a delete/update race condition for scene objects. However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
* Yet more things out of the main Update thread loop and into threadlets. This ↵Diva Canto2010-12-142-9/+11
| | | | time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
* Another attempt at moving heavy computation away from the Update loop. #LoginLagDiva Canto2010-12-141-2/+6
|
* Commented out the UpdateLand call from the Update thread loop, because this ↵Diva Canto2010-12-142-6/+7
| | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
* Fix windows compile breakjustincc2010-12-151-0/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2010-12-1561-730/+1559
|\
| * fix mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-152-5/+7
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-149-8/+478
| |\
| | * add new optionalmodules test dll to panda test run (and nant test command)Justin Clark-Casey (justincc)2010-12-141-0/+23
| | |
| | * Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its ↵Justin Clark-Casey (justincc)2010-12-141-0/+0
| | | | | | | | | | | | contents
| | * minor: disable debug logging for previous testJustin Clark-Casey (justincc)2010-12-141-1/+1
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-141-126/+127
| | |\
| | * | Start implementing a test for 'share with group' object functionality. Not ↵Justin Clark-Casey (justincc)2010-12-145-7/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | yet complete. While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete. Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
| | * | Add mock group services connector and use this in testsJustin Clark-Casey (justincc)2010-12-144-3/+250
| | | |
| | * | add infrastructure for groups module testsJustin Clark-Casey (justincc)2010-12-142-0/+110
| | | |
| * | | Another stab at #LoginLag. Looking forward to hear the feedback! This makes ↵Diva Canto2010-12-141-2/+23
| | |/ | |/| | | | | | | updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
| * | Relax a highly constraining lock on m_entityUpdates that may be preventing ↵Diva Canto2010-12-141-126/+127
| |/ | | | | | | reprioritizations from actually happening. #LoginLag
| * Made the map thread request the map items asynchronously, as the name ↵Diva Canto2010-12-141-9/+71
| | | | | | | | suggested -- but with a cap of 20 async requests max at any given time.
| * More on mantis #5270Diva Canto2010-12-141-2/+3
| |
| * Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for ↵Diva Canto2010-12-143-25/+90
| | | | | | | | grided sims.
| * Null checking ParentGroup is not needed. It can't be null.Melanie2010-12-141-4/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-1322-254/+374
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-1419-241/+347
| | |\