Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-29 | 2 | -43/+45 |
|\ | |||||
| * | Fix Av jump motion S/W | Kitto Flora | 2010-04-29 | 1 | -2/+2 |
| | | |||||
| * | Fix vertical attractor | Kitto Flora | 2010-04-29 | 1 | -41/+43 |
| | | |||||
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -11/+21 |
|\ \ | |/ | |||||
| * | Adding some more SNMP events and some refactoring | sacha | 2010-04-23 | 2 | -8/+14 |
| | | | | | | | | Signed : The Masqued Foxi | ||||
| * | Adding LinkUp/LinkDown when a region is started or stoped. | sacha | 2010-04-23 | 2 | -3/+7 |
| | | | | | | | | Those two events could be used to compute the region availibility | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 1 | -0/+324 |
|\ \ | |||||
| * | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵ | Diva Canto | 2010-04-26 | 1 | -0/+324 |
| | | | | | | | | | | | | default configs yet. | ||||
| * | | Fix build break. | Melanie | 2010-04-27 | 1 | -17/+17 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -6/+3 |
|\ \ \ | |/ / | |||||
| * | | Add a parameter to prim inventory update to prevent event firing | Melanie | 2010-04-27 | 2 | -18/+26 |
| | | | |||||
| * | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵ | Diva Canto | 2010-04-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from! * IRegionModule.cs wants to be committed too -- EOF. | ||||
| * | | minor: eliminate configuration section handling deprecation of ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -6/+0 |
| | | | | | | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time | ||||
| * | | add a comment about deprecating IRegionModule | dahlia | 2010-04-23 | 1 | -0/+3 |
| | | | |||||
* | | | Add a parameter to prim inventory update to prevent event firing | Melanie Thielker | 2010-04-27 | 2 | -1/+8 |
| | | | |||||
* | | | Make scripted attachment states work. Finally. Also replace two monitor locks | Melanie Thielker | 2010-04-25 | 3 | -14/+35 |
| | | | | | | | | | | | | with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway | ||||
* | | | Use the saved script states | Melanie Thielker | 2010-04-24 | 2 | -2/+36 |
| | | | |||||
* | | | Plumb a data path to initialize an attachment from an alternate source | Melanie Thielker | 2010-04-24 | 4 | -4/+26 |
| | | | |||||
* | | | Add an additional serialization call do the detach procedure. This call is | Melanie Thielker | 2010-04-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | executed only for it's side effects, which are to block until attach(NULL_KEY) completes, before commencing detachment. | ||||
* | | | Remove debug output, the culprit has been identified | Melanie Thielker | 2010-04-23 | 3 | -8/+0 |
| | | | |||||
* | | | Fix a nullref in attachment handling. Add some debug to find the attachment | Melanie Thielker | 2010-04-23 | 4 | -1/+10 |
| | | | | | | | | | | | | state issue | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-21 | 5 | -28/+113 |
|\ \ \ | |/ / | |||||
| * | | Make the detection cone in attachments face in the direction of the avatar, | Melanie | 2010-04-21 | 1 | -0/+9 |
| | | | | | | | | | | | | not the relative rotation of the attachment towards the avatar. | ||||
| * | | minor: change a comment and replace some magic numbers with the AssetType enum | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-19 | 14 | -31/+113 |
| |\ \ | |||||
| | * | | Avoid duplicate script resumes. Move resume calls to more logical places | Melanie Thielker | 2010-04-19 | 2 | -2/+2 |
| | | | | |||||
| * | | | Make the "notecard saved" text appear in the saver rather than the notecard ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 3 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | If a transfer request is received for a task inventory item asset, then ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 2 | -50/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route the permissions request through the existing CanEditScript() and CanEditNotecard() methods. This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions. Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts. For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts | ||||
| * | | | log problems when an asset request through the UDP TransferRequest channel ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -2/+45 |
| | | | | | | | | | | | | | | | | goes wrong | ||||
* | | | | Avoid duplicate script resumes. Move resume calls to more logical places | Melanie Thielker | 2010-04-19 | 2 | -2/+2 |
| | | | | |||||
* | | | | Remove the event trigger for the attach event from the attachment module. | Melanie Thielker | 2010-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | The script engine already triggers this internally. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 2 | -33/+30 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Make script asset fetches synchronous. Script instantiation synchronization | Melanie | 2010-04-19 | 1 | -28/+24 |
| | | | | | | | | | | | | | | | | will not work if the instance is not created when the method returns. | ||||
| * | | | Stopgap measure. Disable the recent script startup changes until I can cure the | Melanie | 2010-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | race condition. | ||||
| * | | | And some more rez modes that weren't covered before | Melanie Thielker | 2010-04-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | 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 | 35 | -517/+880 |
|\ \ \ \ | |/ / / | |||||
| * | | | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 14 | -3/+85 |
| |/ / | | | | | | | | | | | | | | | | 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: move DeatchObject() into the AttachmentsModule | Justin Clark-Casey (justincc) | 2010-04-17 | 3 | -6/+24 |
| | | | |||||
| * | | 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 | 4 | -33/+40 |
| | | | | | | | | | | | | AttachmentsModule | ||||
| * | | minor: correctly print out missing item id when it can't be found rather ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 2 | -2/+4 |
| | | | | | | | | | | | | than a NullReferenceException | ||||
| * | | refactor: crudely move the RezMultipleAttachments() method into the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 4 | -14/+28 |
| | | | | | | | | | | | | AttachmentsModule | ||||
| * | | minor: use the static ascii and utf8 encodings instead of instantiating our own | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -6/+3 |
| | | | |||||
| * | | Add --skip-assets option to load oar. | Justin Clark-Casey (justincc) | 2010-04-16 | 5 | -28/+50 |
| | | | | | | | | | | | | | | | This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker. This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation. | ||||
| * | | add a missing initialization of the m_memoryCache in ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | XmlRpcGroupsServicesConnectorModule the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations | ||||
| * | | minor: stop irc bridge warning about not attached to regions if it's not ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | been turned on in the first place | ||||
| * | | minor: stop datasnapshot issuing a warning log message if it's disabled | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -3/+3 |
| | | |