aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-118-146/+267
| |\ \ | | |/
| | * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-168-146/+267
| | | | | | | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
| * | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-112-4/+14
| |\ \ | | |/
| | * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-162-4/+14
| | |
| * | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmergeMelanie2011-10-113-2/+21
| |\ \ | | |/
| | * On standalone, by default create the necessary minimum body parts and ↵Justin Clark-Casey (justincc)2011-09-163-2/+21
| | | | | | | | | | | | | | | | | | | | | clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini This is left as false in grid mode
| * | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-112-45/+52
| |\ \ | | |/
| | * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-162-45/+52
| | |
| * | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-115-93/+69
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
| | * Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-165-94/+70
| | | | | | | | | | | | entries on standalone if applicable.
| * | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-1112-148/+362
| |\ \ | | |/
| | * Write code to create minimum necessary body parts/clothing and avatar ↵Justin Clark-Casey (justincc)2011-09-1512-148/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entries to make a newly created user appear as a non-cloud on viewer 2 Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries. Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim. Default is currently off. My intention is to switch it on for standalone shortly. This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities. Need to fix creation of suitable entries for users created as estate owners on standalone. Avatars still appear with spooky empty eyes, need to see if we can address this. This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used.
| * | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-118-44/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵Justin Clark-Casey (justincc)2011-09-158-43/+43
| | | | | | | | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client.
| * | Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmergeMelanie2011-10-110-0/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * Only bother to create an inventory xfer file if there are any items in a ↵Justin Clark-Casey (justincc)2011-09-151-2/+2
| | | | | | | | | | | | prim inventory
| * | Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmergeMelanie2011-10-112-12/+18
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * Shuffle order of code in invnetory connector GetFolderContent() calls to ↵Justin Clark-Casey (justincc)2011-09-153-13/+19
| | | | | | | | | | | | avoid a possible race condition
| * | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmergeMelanie2011-10-111-0/+11
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * If a prim inventory becomes empty through deletion, send an empty xfer file ↵Justin Clark-Casey (justincc)2011-09-151-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | name rather than one that references a metadata file containing only the folder object. If we do this, then viewer 3 crashes when we try and rez a script directly in an attachment's prim inventory. Sending an empty file name was already being done if the prim's inventory had never been touched. Now we always do that if there are no items in that inventory. Hopefully addresses the remaining point in http://opensimulator.org/mantis/view.php?id=5644
* | | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-062-10/+67
|\ \ \ | |/ / |/| |
| * | Fix physics proxy position when linking and rotating the root prim onlyMelanie2011-10-061-2/+6
| | |
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
| | | | | | | | | | | | depending on the first two digits of the asset id.
* | | Fixed a movement regression - Kitto's jump code is no longer needed (plus ↵Tom2011-09-141-37/+9
| | | | | | | | | | | | it's an eyesore)
* | | Fix a rather stupid VS warning "The operation overflows at compile time in ↵Tom2011-09-141-3/+3
| | | | | | | | | | | | checked mode" - doesn't make much sense to me, but for some reason it doesn't like 256 - 6 when 256 is a constant...
* | | Bring us up to date.Tom2011-09-1449-624/+1316
|\ \ \ | | |/ | |/|
| * | Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-132-1/+34
| | |
| * | Remove code from DetachSingleAttachmentToInv() that sets group changed on ↵Justin Clark-Casey (justincc)2011-09-131-11/+0
| | | | | | | | | | | | all parts, now that we're performing this check in UpdateKnownItem() for other purposes
| * | remove redunant itemID and agentID arguments from UpdateKnownItem().Justin Clark-Casey (justincc)2011-09-131-6/+4
| | | | | | | | | | | | itemID is always taken taken from the group's stored item id, and agentID is never used.
| * | Remove UpdateKnownItem() from IAttachmentsModule.Justin Clark-Casey (justincc)2011-09-132-10/+1
| | | | | | | | | | | | It's not appropriate for code outside the attachments module to call this.
| * | minor: remove redundant grp != null check from AM.UpdateKnownItem()Justin Clark-Casey (justincc)2011-09-131-36/+33
| | |
| * | Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-134-44/+97
| | | | | | | | | | | | | | | | | | | | | | | | Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process. This change ignores those attempts. This stops script failures during login, as the rewearing was racing with the script startup code. It might also help with attachments being abnormally put into deleted state. Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644
| * | Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ↵Justin Clark-Casey (justincc)2011-09-133-13/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | itemID) for now As far as I can see, this is only invoked by a PUT request to ObjectHandlers, which is not being used anyway. Invoking attachments code at this point is probably inappropriate since it would still be invoked when the client entered the scene. Being commented to simplify analysis of attachments issues. Can be uncommented when in use. Also, small tweak to lock and log removal of a SOG from the SceneObjectGroupsByLocalPartID collection in SceneGraph.GetGroupByPrim() if an inconsistency is found.
| * | stop the duplicate remove of the root part ids from the full part and local ↵Justin Clark-Casey (justincc)2011-09-132-3/+1
| | | | | | | | | | | | | | | | | | part indexes in SG.DeleteSceneObject() this is unnecessary because the parts array iterated through contains the root part as well as the non-root parts
| * | extend TestGetSceneObjectByPartLocalId() to test state after scene object ↵Justin Clark-Casey (justincc)2011-09-131-0/+6
| | | | | | | | | | | | deletion
| * | In SG.AddSceneObject(), stop unnecessarily adding the root part to object ↵Justin Clark-Casey (justincc)2011-09-131-7/+5
| | | | | | | | | | | | | | | | | | indexes sepearately from the other parts. The SOG.Parts property contains the root part as well as the non-root parts
| * | Add new TestGetSceneObjectByPartLocalId() for retrieving a scene object via ↵Justin Clark-Casey (justincc)2011-09-131-0/+27
| | | | | | | | | | | | the local id of one of its parts
| * | improve TestAddSceneObject() to test a multi-part object rather than a ↵Justin Clark-Casey (justincc)2011-09-131-11/+14
| | | | | | | | | | | | single-part
| * | In an object return message, send a null-terminated empty string in binary ↵Justin Clark-Casey (justincc)2011-09-132-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | bucket to prevent a viewer 3 crash. This is the message sent to the client when the object is returned. We were sending byte[0] in the binary bucket. This didn't kill viewer 1 but did terminate viewer 3 (don't know about viewer 2). So sending "\0" instead. This is to address http://opensimulator.org/mantis/view.php?id=5683
| * | eliminate redundant SP.m_regionInfo since it always has the scene.Justin Clark-Casey (justincc)2011-09-121-8/+6
| | | | | | | | | | | | We were already referencing through the scene in some places.
| * | remove the unused SP.initializeScenePresence()Justin Clark-Casey (justincc)2011-09-121-23/+2
| | |
| * | stop the redundant passing in of RegionInfo to SceneGraph, since the Scene ↵Justin Clark-Casey (justincc)2011-09-123-10/+7
| | | | | | | | | | | | is always passed in at the same time.
| * | minor: if the script engine fails to find a prim for a script, also print ↵Justin Clark-Casey (justincc)2011-09-122-1/+5
| | | | | | | | | | | | out that prim's local id in the error message.
| * | comment out some recent terrain texture loggingJustin Clark-Casey (justincc)2011-09-122-5/+5
| | |
| * | Start locking entire add/remove operations on an ↵Justin Clark-Casey (justincc)2011-09-124-175/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | IScenePresence.AttachmentsSyncLock object Attach and detach packets are processed asynchronously when received from a viewer. Bugs like http://opensimulator.org/mantis/view.php?id=5644 indicate that in some situations (such as attaching/detaching entire folders of objects at once), there are race conditions between these threads. Since multiple data structures need to be updated on attach/detach, it's not enough to lock the individual collections. Therefore, this commit introduces a new IScenePresence.AttachmentsSyncLock which add/remove operations lock on.
| * | lock AvatarAppearance.m_attachments when we use itJustin Clark-Casey (justincc)2011-09-121-33/+58
| | | | | | | | | | | | This is partly to address http://opensimulator.org/mantis/view.php?id=5644, though something more thorough is needed.
| * | uncomment Standalone config in OpenSim.ini.example.Justin Clark-Casey (justincc)2011-09-121-1/+1
| | | | | | | | | | | | | | | This is to make my life easier when creating releases. I think that it also gives a better story for anybody newly compiling from source.
| * | When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-126-44/+217
| | |
| * | minor: put <remarks> tags around some method docJustin Clark-Casey (justincc)2011-09-121-5/+6
| | |
| * | lock attachments when enumerating through them in ScenePresence.CopyTo().Justin Clark-Casey (justincc)2011-09-102-21/+24
| | | | | | | | | | | | May have some effect on http://opensimulator.org/mantis/view.php?id=5644
generated by cgit v1.1 at 2024-12-21 11:07:51 +0000