aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* When an oar is loaded, do not create a default parcel before loading the ↵Justin Clark-Casey (justincc)2011-01-271-1/+4
| | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
* Fix OAR parcel loading so that old parcels are replaced by the new instead ↵Justin Clark-Casey (justincc)2011-01-271-0/+5
| | | | | | of merged. The --merge switch will still merge the old and new land parcelling.
* Make it workMelanie2011-01-271-4/+6
|
* Add a TeleportFlags member to SP so we can tell how we got there.Melanie2011-01-272-0/+15
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-01-261-0/+14
|\
| * Add some comments on ILandObject.StartPoint and EndPointJustin Clark-Casey (justincc)2011-01-261-0/+10
| |
| * Implement command "land show". This shows all the parcels on the currently ↵Justin Clark-Casey (justincc)2011-01-261-0/+4
| | | | | | | | | | | | selected region/s This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
* | Remove the RestorePresences functions (which don't seem to be doingMic Bowman2011-01-262-69/+12
|/ | | | | anything) and clean up the code in AddNewClient (so Appearance only gets assigned once, not three times).
* Fix script data not being reset as it should beMelanie2011-01-241-0/+4
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-01-172-5/+5
|\
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-182-2/+2
| |
| * Prune some of the excess logging for client logins.Justin Clark-Casey (justincc)2011-01-181-3/+3
| | | | | | | | Didn't touch the appearance related stuff.
* | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, ↵Diva Canto2011-01-171-8/+0
|/ | | | because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
* Revert "DEBUG DEBUG DEBUG"Diva Canto2011-01-171-4/+0
| | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5.
* DEBUG DEBUG DEBUGDiva Canto2011-01-171-0/+4
|
* Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
|
* Dont' trust the viewer! Fix a permission slam error caused by trustingMelanie2011-01-121-1/+0
| | | | the viewer too much.
* Fix direct item give permissionsMelanie2011-01-123-12/+56
|
* Partial permissions fix for boxed items.Melanie2011-01-122-0/+17
|
* Fix god mode perms adjustmentMelanie2011-01-121-0/+2
|
* Fixes the issue of hung archives. Problem was with SceneObjectSerializer.Diva Canto2011-01-081-0/+12
| | | | Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
* Try to fix a IAR problem reported by nebadon, where save iar seems stuck ↵Diva Canto2011-01-071-0/+4
| | | | forever.
* A bit more frugal on the caller side of closing agents, now that the ↵Diva Canto2011-01-071-16/+20
| | | | receiving end is async. No need for so much concurrency.
* HG bug fix. Must wait for client's UDP contact before getting scene presence.Diva Canto2011-01-061-4/+11
|
* Note to self: try to make only 3 things at the same time.Diva Canto2011-01-041-1/+1
|
* Guard against null Animator.Diva Canto2011-01-041-1/+2
|
* Add permissions hooks for object transfersMelanie2011-01-031-4/+57
|
* Fix child agent scopingMelanie2011-01-031-4/+4
|
* Fix up a prior fix (refix the fixed fix :)Melanie2010-12-301-1/+1
|
* Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors ↵Diva Canto2010-12-291-2/+2
| | | | were not getting notified.
* One more pass at object inventory. This time, fix SceneObjectPartInventory ↵Diva Canto2010-12-241-68/+68
| | | | so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
* Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-12-231-58/+0
|\
| * Removed unused code -- this was the previous version of UDP texture sending, ↵Diva Canto2010-12-231-58/+0
| | | | | | | | which now lives entirely in LindenUDP space.
* | * Cleanup from a commit a while ago.Teravus Ovares (Dan Olivares)2010-12-231-4/+10
|/
* 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
|
* 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.
* 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
|
* 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 mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-151-4/+6
|
* 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
|
* Start implementing a test for 'share with group' object functionality. Not ↵Justin Clark-Casey (justincc)2010-12-141-0/+87
| | | | | | | 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)
* Null checking ParentGroup is not needed. It can't be null.Melanie2010-12-141-4/+2
|