aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.Diva Canto2010-04-292-279/+282
|
* Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵Diva Canto2010-04-294-3/+648
| | | | mind. Unfinished.
* Merge branch 'minor-stuff'Melanie2010-04-287-67/+74
|\
| * Refactoring in Migration.cs: "using()" instead of explicit Dispose()AlexRa2010-04-281-52/+56
| | | | | | | | This ensures that 'cmd' gets disposed on errors
| * Fixed comments in Migration.cs: wrong argument order (no change to code)AlexRa2010-04-281-2/+2
| |
| * Compiler.cs contained method GetCompilerOutput which, apparently,unknown2010-04-281-4/+7
| | | | | | | | | | | | | | was not used, but exactly the same path was calculated inline. This patch does some minor refactoring by replacing inline path calculation with GetCompilerOutput. This doesn't actually affect anything, just minor prettifying of the code
| * Just a bit of spellchecking in the commentsAlexRa2010-04-281-2/+2
| |
| * Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| |
| * Minor spelling corrections in MiniModule: "RetreiveAsset" changed tounknown2010-04-282-5/+5
| | | | | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
| * Removed unused var from InventoryService.cs (-1 warning)AlexRa2010-04-281-1/+1
| |
* | Commented verbose debug messages from XInventory handler.Diva Canto2010-04-281-13/+13
| |
* | Putting it back to protected; Melanie doesn't like it to be public.Diva Canto2010-04-271-1/+1
| |
* | Changed GetToken from protected to public. This is not exposed at the interface.Diva Canto2010-04-271-1/+1
| |
* | * Thanks cmickeyb, for a patch that sanity checks if the response from ↵John Hurliman2010-04-271-1/+4
| | | | | | | | m_Database.GetAsset(assetID) is null in AssetService.cs
* | * Thanks cmickeyb, for a patch that corrects an invalid construction of ↵John Hurliman2010-04-271-1/+1
| | | | | | | | Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
* | XInventory connector/handler showing signs of life. Tested, but needs more ↵Diva Canto2010-04-275-69/+139
|/ | | | testing.
* 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
|
* Add a parameter to prim inventory update to prevent event firingMelanie2010-04-272-18/+26
|
* Better error message.Diva Canto2010-04-261-1/+1
|
* * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵Diva Canto2010-04-261-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-231-6/+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-235-10/+31
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-2236-188/+455
| |\
| | * 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
| | |
| | * 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.
| * | * 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-2316-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-2361-0/+6341
| |/ |/| | | | | shortly be changed to work under mono 2.6 and above
* | 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 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
| | |
| * | Also enable scripts rezzed into primsMelanie2010-04-191-0/+2
| | |
| * | All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-1914-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.
* | | 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
* | One more bug fix in sqlite sql statements.Diva Canto2010-04-161-1/+1
| |