Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 '0.6.9-post-fixes' into careminster | Melanie | 2010-04-19 | 2 | -17/+48 |
| |\ | |||||
| | * | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 2 | -17/+48 |
| | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 6 | -18/+442 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-27 | 3 | -1/+400 |
| |\ \ \ | |||||
| | * | | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵ | Diva Canto | 2010-04-26 | 3 | -1/+400 |
| | | | | | | | | | | | | | | | | | | | | default configs yet. | ||||
| * | | | | Allow a client to pass a scope id to log into in the login XML / LLSD | Melanie | 2010-04-27 | 3 | -17/+42 |
| |/ / / | |||||
| * | | | Fix build break. | Melanie | 2010-04-27 | 1 | -17/+17 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 64 | -18/+6179 |
|\ \ \ \ | |/ / / | |||||
| * | | | Add a parameter to prim inventory update to prevent event firing | Melanie | 2010-04-27 | 2 | -18/+26 |
| | | | | |||||
| * | | | Better error message. | Diva Canto | 2010-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | * 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 | ||||
| * | | | get region prim saving working properly in SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -10/+13 |
| | | | | | | | | | | | | | | | | it wasn't working because of debug work that I'd forgotton to take out | ||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-23 | 12 | -11/+14 |
| |\ \ \ | |||||
| | * | | | add a comment about deprecating IRegionModule | dahlia | 2010-04-23 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | put SQLiteNG classes in their own namespace to avoid confusion | Justin Clark-Casey | 2010-04-23 | 12 | -12/+12 |
| | | | | | |||||
| * | | | | dispose of the DbCommand used to execute migrations after we've finished ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 2 | -2/+3 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | with it rather than within the loop disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway | ||||
| * | | | minor: correct the assembly information for SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-23 | 5 | -10/+31 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-04-22 | 36 | -188/+455 |
| | |\ \ \ | |||||
| | | * | | | Insert a ROLLBACK command on migration step failure. This ensures that | Melanie | 2010-04-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating the Migrations table will not occur in a partial transaction, which would be auto-rolled-back later. | ||||
| | | * | | | Sanitized parsing of floats (x, y, z location) for Culture. | Diva Canto | 2010-04-22 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | * Better error logging for failed SimianGrid web service calls | John Hurliman | 2010-04-22 | 2 | -7/+17 |
| | | | | | | |||||
| * | | | | | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-23 | 16 | -429/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the library so that Windows builds correctly It appears that Windows is okay with either SQLite or SQLiteNG Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite | ||||
| * | | | | | Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 61 | -0/+6341 |
| | | | | | | | | | | | | | | | | | | | | | | | | shortly be changed to work under mono 2.6 and above | ||||
* | | | | | | 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 |
| | | | | | | |||||
* | | | | | | Remove some usings that stopped compilation | Melanie Thielker | 2010-04-24 | 1 | -15/+1 |
| | | | | | | |||||
* | | | | | | Plumb a data path to initialize an attachment from an alternate source | Melanie Thielker | 2010-04-24 | 5 | -4/+57 |
| | | | | | | |||||
* | | | | | | 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 |
| | | | | | |