Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix a nullref in attachment handling. Add some debug to find the attachment | Melanie Thielker | 2010-04-23 | 1 | -0/+1 |
| | | | | state issue | ||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-21 | 1 | -1/+6 |
|\ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -0/+6 |
| |\ | |||||
| | * | And some more rez modes that weren't covered before | Melanie Thielker | 2010-04-19 | 1 | -0/+2 |
| | | | |||||
| * | | Make the "notecard saved" text appear in the saver rather than the notecard ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | owner, if the notecard is saved by a permitted group member This means moving the alert up to a place where the IClientAPI is available. One can also argue that such client messages shouldn't be sent directly from the scene data model | ||||
* | | | And some more rez modes that weren't covered before | Melanie Thielker | 2010-04-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Also enable scripts rezzed into prims | Melanie | 2010-04-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -46/+34 |
|\ \ \ | |/ / | |||||
| * | | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+2 |
| |/ | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable. | ||||
| * | refactor: remove now unused internal method SendAttachEvent() | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -5/+0 |
| | | |||||
| * | refactor: crudely move DetachSingleAttachmentToGround() over to the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -30/+0 |
| | | | | | | | | AttachmentsModule | ||||
| * | minor: correctly print out missing item id when it can't be found rather ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -1/+0 |
| | | | | | | | | than a NullReferenceException | ||||
| * | refactor: crudely move the RezMultipleAttachments() method into the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -10/+0 |
| | | | | | | | | AttachmentsModule | ||||
| * | thanks lkalif for Mantis #4676 - a patch that adds support for inventory links | dahlia | 2010-04-12 | 1 | -0/+31 |
| | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| * | Partially implement share with group option for object inventory items | Justin Clark-Casey (justincc) | 2010-04-05 | 1 | -0/+1 |
| | | | | | | | | | | | | If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off. If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active. However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway | ||||
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 1 | -2/+1 |
|\ \ | |||||
| * | | guarantee that a script engine's GetScriptErrors() will not be called | Mike Rieker | 2010-04-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved | ||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 1 | -7/+37 |
| |\ \ | |||||
| | * | | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 1 | -7/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head. | ||||
| * | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 1 | -8/+8 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-19 | 1 | -3/+4 |
| |\ \ \ | |||||
| | * | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
| * | | | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 1 | -8/+8 |
| |/ / / | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | ||||
* | | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -33/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -24/+1 |
| | | | | | | | | | | | | | | | | AttachmentsModule | ||||
| * | | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | AttachmentsModule | ||||
| * | | | * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken ↵ | John Hurliman | 2010-03-10 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | debug line, and commented the debug line out since it can quickly become noisy | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 1 | -107/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | refactor: Move DetachSingleAttachmentToInv to region module | Justin Clark-Casey (justincc) | 2010-03-06 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | | need to rationalize method names later | ||||
| * | | | refactor: move another AttachObject method | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -44/+0 |
| | | | | |||||
| * | | | refactor: move user inventory side of RezSingleAttachment to module | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -29/+1 |
| | | | | |||||
| * | | | refactor: begin to move attachments code into a region module | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -15/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 1 | -7/+37 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -7/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 1 | -546/+44 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | This brings careminster on the level of master. To be tested | ||||
| * | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| | | | |||||
| * | | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 1 | -13/+11 |
| | | | | | | | | | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-15 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | Plug a small hole | Melanie | 2010-02-14 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 1 | -3/+15 |
| |\ \ | | |/ | | | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | ||||
| * | | * HGScene is no more. | Diva Canto | 2010-01-30 | 1 | -506/+13 |
| | | | | | | | | | | | | * Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module | ||||
| * | | Several more buglets removed. | Diva Canto | 2010-01-13 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed a couple of bugs with Appearance. Appearance is all good now. | Diva Canto | 2010-01-11 | 1 | -2/+2 |
| | | | |||||
| * | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. | ||||
| * | | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 1 | -7/+3 |
| | | | | | | | | | | | | | | | * HG is seriously broken here * Compiles. Untested. | ||||
| * | | * Finished SimulationServiceConnector | Diva Canto | 2010-01-07 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | * Started rerouting calls to UserService. * Compiles. May run. |