aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2011-08-252-51/+111
| |\
| | * llSetPrimitiveParams correct prim hollow for cases where limit should be 70%.Micheil Merlin2011-08-252-51/+111
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Remove forcing of phantom on ground attached objects - attachments can be ↵Justin Clark-Casey (justincc)2011-08-243-7/+2
| | | | | | | | | | | | | | | | | | both non-phantom and flagged as physical. As per Melanie
| * | remove pointless IsDeleted check on SP.RezAttachments()Justin Clark-Casey (justincc)2011-08-241-3/+0
| | | | | | | | | | | | | | | IsDeleted is never set for an SP, even though it's on EntityBase. It might be an idea to set it in the future
| * | refactor: simplify EntityBase.IsDeleted propertyJustin Clark-Casey (justincc)2011-08-243-10/+5
| | |
| * | extend initial rez regression test to check that attachment is phantomJustin Clark-Casey (justincc)2011-08-241-9/+14
| | |
| * | Make objects attached from the ground phantomJustin Clark-Casey (justincc)2011-08-242-2/+12
| | |
| * | add SOG helper properties IsPhantom, IsTemporary, etc. to improve code ↵Justin Clark-Casey (justincc)2011-08-241-20/+46
| | | | | | | | | | | | | | | | | | readability use these in some sog methods
| * | return InventoryItemBase from AddSceneObjectAsAttachment()Justin Clark-Casey (justincc)2011-08-241-8/+4
| | |
| * | refactor: move Scene.Inventory.attachObjectAssetStore() into ↵Justin Clark-Casey (justincc)2011-08-242-86/+100
| | | | | | | | | | | | AttachmentsModule.AddSceneObjectAsAttachment()
| * | get rid of pointless grp null check in attachObjectAssetStore()Justin Clark-Casey (justincc)2011-08-241-73/+69
| | |
| * | minor: remove hardcoded region numbers with the region size constant and a ↵Justin Clark-Casey (justincc)2011-08-241-2/+2
| | | | | | | | | | | | currently hardcoded offset
| * | refactor: remove pointless AgentId argument from attachObjectAssetStore()Justin Clark-Casey (justincc)2011-08-242-2/+2
| | |
| * | add TestAddAttachmentFromGround() regression testJustin Clark-Casey (justincc)2011-08-242-2/+32
| |/
| * Fix llAttachToAvatar()Justin Clark-Casey (justincc)2011-08-246-24/+80
| | | | | | | | | | | | Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay. So we now don't do this. The state will be serialized anyway when the avatar normally logs out. The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state.
| * rename AttachmentsModule.ShowDetachInUserInventory() to ↵Justin Clark-Casey (justincc)2011-08-234-23/+14
| | | | | | | | DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour
| * remove mono compiler warningsJustin Clark-Casey (justincc)2011-08-239-16/+4
| |
| * replace TestRemoveAttachments() with a more thorough TestRemoveAttachment()Justin Clark-Casey (justincc)2011-08-231-51/+27
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-08-231-3/+10
| |\
| | * Protect a check for default texture entry when setting alpha values. ApparentlyMic Bowman2011-08-231-3/+10
| | | | | | | | | | | | if all faces have their own textures then the default texture is null
| * | replace old TestAddAttachments() with a more thorough TestAddAttachment()Justin Clark-Casey (justincc)2011-08-231-7/+28
| |/
| * Remove pointless contains check in ScenePresence.RemoveAttachment()Justin Clark-Casey (justincc)2011-08-231-6/+1
| |
| * If an object failed to attach due to an exception, then try and detach it ↵Justin Clark-Casey (justincc)2011-08-231-1/+2
| | | | | | | | | | | | | | from the avatar's list of attachments as well as delete it from the scene. This may help with the "Inconsistent attachment state" errors seen on teleport. See http://opensimulator.org/mantis/view.php?id=5644 and linked reports
| * If an attachment fails, then start logging the exception for now, in order ↵Justin Clark-Casey (justincc)2011-08-223-61/+84
| | | | | | | | | | | | to help with the inconsistent state bug. This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods. However, more of this is required.
| * Add warning log message to say which attachment fails validation in order to ↵Justin Clark-Casey (justincc)2011-08-221-0/+10
| | | | | | | | pin down problems with "Inconsistent Attachment State"
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+1
| |
| * minor: comment out simulator features log lineJustin Clark-Casey (justincc)2011-08-221-1/+1
| |
| * Add ISimulatorFeaturesModule so that other modules can register features in ↵Justin Clark-Casey (justincc)2011-08-222-36/+129
| | | | | | | | addition to the hardcoded ones.
| * Thanks Neil Canham for fixing bulk inventory updates, no sending ↵Snoopy Pfeffer2011-08-222-2/+13
| | | | | | | | BulkInventoryUpdate after accepting inventory items.
| * read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)2011-08-221-2/+4
| |
| * oops, fix build break from last commitJustin Clark-Casey (justincc)2011-08-221-12/+8
| |
| * improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-10/+10
| |
| * improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+2
| |
| * improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+4
| |
| * remove necessity to catch a KeyNotFoundException in ↵Justin Clark-Casey (justincc)2011-08-221-11/+6
| | | | | | | | BaseHttpServer.RemoveLLSDHandler()
| * improve locking of m_llsdHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-30/+32
| |
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+3
| |
| * improve locking of m_rpcHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-1/+2
| |
| * Add avatar and attachments to llRegionSayBlueWall2011-08-203-11/+71
| | | | | | | | | | | | | | | | | | | | | | | | llRegionSay will now message avatars on chan 0 and will message attachments on the avatar that listen on channels other than 0. This behavior is consistant with the LL implementation as tested on regions in Agni with one exception: this implementation does not include issue: https://jira.secondlife.com/browse/SCR-66?
| * Add llRegionSayToBlueWall2011-08-195-6/+68
| | | | | | | | | | | | | | llRegionSayTo(key target, integer channel, string messasge) Allows messages to be sent region-wide to a particular prim.
* | Merge branch 'master' into bulletsimMic Bowman2011-08-19102-1132/+2603
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Fix exception when using BasicPhysicsRobert Adams2011-08-191-2/+2
| |
| * Stop NPC's getting hypergrid like names in some circumstances.Justin Clark-Casey (justincc)2011-08-195-29/+102
| | | | | | | | | | This meant punching in another AddUser() method in IUserManagement to do a direct name to UUID associated without the account check (since NPCs don't have accounts). May address http://opensimulator.org/mantis/view.php?id=5645
| * Don't need to try both AssetService.Get and GetCached in GetMesh since Get ↵Justin Clark-Casey (justincc)2011-08-182-38/+15
| | | | | | | | always calls GetCached and code paths were identical
| * refactor: fold CreateSceneViewer() back into ScenePresence constructorJustin Clark-Casey (justincc)2011-08-181-6/+1
| |
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-08-182-2/+2
| |
| * refactor: Fold 3 ScenePresence() constructors into one since only one is called.Justin Clark-Casey (justincc)2011-08-181-9/+2
| |
| * Don't try to save changed attachment states when an NPC with attachments is ↵Justin Clark-Casey (justincc)2011-08-1814-23/+71
| | | | | | | | | | | | | | removed from the scene. This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc. This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
| * comment out noisy attachments loggingJustin Clark-Casey (justincc)2011-08-171-5/+5
| |
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-171-1/+1
| |