aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-276-18/+442
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-273-1/+400
| |\
| | * RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵Diva Canto2010-04-263-1/+400
| | | | | | | | | | | | default configs yet.
| * | Allow a client to pass a scope id to log into in the login XML / LLSDMelanie2010-04-273-17/+42
| |/
| * Fix build break.Melanie2010-04-271-17/+17
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-2772-28/+6243
|\ \ | |/
| * Add a parameter to prim inventory update to prevent event firingMelanie2010-04-272-18/+26
| |
| * Better error message.Diva Canto2010-04-261-1/+1
| |
| * Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that ↵Diva Canto2010-04-262-2/+1
| | | | | | | | makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
| * * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵Diva Canto2010-04-262-3/+5
| | | | | | | | | | | | 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.
| * Add instructions for using SQLiteNG to OpenSim.ini and ↵Justin Clark-Casey (justincc)2010-04-233-4/+26
| | | | | | | | | | | | config-include/StandaloneCommon.ini Unfortunately, database settings need to be changed in two places.
| * remove [DatabaseService] section from OpenSim.ini since this is always ↵Justin Clark-Casey (justincc)2010-04-231-4/+0
| | | | | | | | present in included configuration files
| * minor: eliminate configuration section handling deprecation of ↵Justin Clark-Casey (justincc)2010-04-232-7/+0
| | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
| * get region prim saving working properly in SQLiteNGJustin Clark-Casey (justincc)2010-04-231-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/opensimJustin Clark-Casey (justincc)2010-04-2312-11/+14
| |\
| | * add a comment about deprecating IRegionModuledahlia2010-04-231-0/+3
| | |
| | * put SQLiteNG classes in their own namespace to avoid confusionJustin Clark-Casey2010-04-2312-12/+12
| | |
| * | dispose of the DbCommand used to execute migrations after we've finished ↵Justin Clark-Casey (justincc)2010-04-232-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 SQLiteNGJustin Clark-Casey (justincc)2010-04-231-2/+2
| |
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-239-11/+32
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-2241-190/+458
| | |\
| | | * Insert a ROLLBACK command on migration step failure. This ensures thatMelanie2010-04-221-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 Canto2010-04-221-3/+3
| | | |
| | | * Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config.Diva Canto2010-04-224-1/+1
| | | |
| | * | * Better error logging for failed SimianGrid web service callsJohn Hurliman2010-04-222-7/+17
| | | |
| * | | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dllJustin Clark-Casey (justincc)2010-04-2317-431/+237
| | | | | | | | | | | | | | | | | | | | | | | | 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-2362-0/+6378
| | | | | | | | | | | | | | | | shortly be changed to work under mono 2.6 and above
* | | | Add a parameter to prim inventory update to prevent event firingMelanie Thielker2010-04-272-1/+8
| | | |
* | | | Make scripted attachment states work. Finally. Also replace two monitor locksMelanie Thielker2010-04-253-14/+35
| | | | | | | | | | | | | | | | with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
* | | | Use the saved script statesMelanie Thielker2010-04-242-2/+36
| | | |
* | | | Remove some usings that stopped compilationMelanie Thielker2010-04-241-15/+1
| | | |
* | | | Plumb a data path to initialize an attachment from an alternate sourceMelanie Thielker2010-04-245-4/+57
| | | |
* | | | Add an additional serialization call do the detach procedure. This call isMelanie Thielker2010-04-231-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 identifiedMelanie Thielker2010-04-233-8/+0
| | | |
* | | | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-234-1/+10
| | | | | | | | | | | | | | | | state issue
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-215-28/+113
|\ \ \ \ | | |_|/ | |/| |
| * | | Make the detection cone in attachments face in the direction of the avatar,Melanie2010-04-211-0/+9
| |/ / | | | | | | | | | not the relative rotation of the attachment towards the avatar.
| * | minor: change a comment and replace some magic numbers with the AssetType enumJustin Clark-Casey (justincc)2010-04-191-3/+3
| | |
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-1914-31/+113
| |\ \
| | * | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
| | | |
| * | | Make the "notecard saved" text appear in the saver rather than the notecard ↵Justin Clark-Casey (justincc)2010-04-193-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-192-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-191-2/+45
| | | | | | | | | | | | | | | | goes wrong
* | | | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
| | | |
* | | | Remove the event trigger for the attach event from the attachment module.Melanie Thielker2010-04-191-1/+1
| | | | | | | | | | | | | | | | The script engine already triggers this internally.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-192-33/+30
|\ \ \ \ | | |/ / | |/| |
| * | | Make script asset fetches synchronous. Script instantiation synchronizationMelanie2010-04-191-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 theMelanie2010-04-191-1/+1
| | | | | | | | | | | | | | | | race condition.
| * | | And some more rez modes that weren't covered beforeMelanie Thielker2010-04-191-0/+2
| | | |
* | | | And some more rez modes that weren't covered beforeMelanie Thielker2010-04-191-0/+2
| | | |
generated by cgit v1.1 at 2024-12-22 11:52:36 +0000