aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * relocate serialization code from SQLiteRegionData to MoapModule using load ↵Justin Clark-Casey (justincc)2010-07-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and save events. This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future. Remaining non-modularity: PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer. The database also needs to know about MediaRaw though not about Media. IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
| | | * implement llSetPrimMediaParams()Justin Clark-Casey (justincc)2010-07-261-0/+1
| | | | | | | | | | | | | | | | Untested
| | | * start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)2010-07-261-0/+7
| | | | | | | | | | | | | | | | | | | | This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
| | | * do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again
| | * | Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-2/+27
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| | | * | Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour
* | | | | Implement CreateNewOutfitAttachments. This addresses mantis #199.Tom2010-08-061-0/+4
|/ / / /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-043-0/+323
|\ \ \ \ | |/ / /
| * | | Revert "remove long unused OpenSim/Framework/Configuration/* projects"Melanie2010-08-043-0/+323
| | | | | | | | | | | | | | | | This reverts commit cdd3f17b2bee58def470635cfc06e26b0d0145b2.
* | | | don't mask current time reads (since we don't mask the corresponding subtract)Mike Rieker2010-08-031-3/+3
| | | | | | | | | | | | | | | | | | | | if you mask the reads you have to mask the subtract as well. simplest is just don't mask any of it.
* | | | Drop the RestClient timeout from 15 minutes to 30 seconds. This does not ↵Tom2010-08-031-1/+1
| | | | | | | | | | | | | | | | address the problem, but it will allow the regions to recover in the event that the remote server goes away.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-3115-1512/+88
|\ \ \ \ | |/ / /
| * | | Slight improvement on previous commit.Diva Canto2010-07-301-1/+13
| | | |
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-07-3013-1509/+0
| |\ \ \
| | * | | remove long unused OpenSim/Framework/Configuration/* projectsJustin Clark-Casey (justincc)2010-07-303-323/+0
| | | | |
| | * | | Remove unused ILoginServiceToRegionsConnectorJustin Clark-Casey (justincc)2010-07-301-41/+0
| | | | |
| | * | | Remove unused LLFileTransferJustin Clark-Casey (justincc)2010-07-301-40/+0
| | | | |
| | * | | remove long superseded HGNetworkServersInfoJustin Clark-Casey (justincc)2010-07-301-107/+0
| | | | |
| | * | | remove unused FriendRegionInfoJustin Clark-Casey (justincc)2010-07-301-38/+0
| | | | |
| | * | | remove now unused GridConfig, MessageServerConfig, UserConfigJustin Clark-Casey (justincc)2010-07-304-583/+0
| | | | |
| | * | | remove unused ACL classJustin Clark-Casey (justincc)2010-07-302-377/+0
| | | | |
| * | | | Changed the way HG client verification is done: now transforming local and ↵Diva Canto2010-07-301-0/+72
| |/ / / | | | | | | | | | | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
| * | | * Tweaked WebUtil.PostToService() to help debug an object disposed exceptionJohn Hurliman2010-07-291-3/+4
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-291-1/+1
|\ \ \ | |/ /
| * | Added ': ' to password prompt. Mantis #4851Diva Canto2010-07-221-1/+1
| | |
| * | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-141-1/+0
| | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
| * | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
| | |
| * | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
| | |
* | | Replace the screenful of code i deleted.Melanie Thielker2010-07-171-0/+19
| | |
* | | Make webloading more robust by addign retriesMelanie Thielker2010-07-171-26/+22
| | |
* | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-141-1/+0
| | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
| | |
* | | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
| | |
* | | Fix the synchronousrestformsrequester so it will successfully handle a ↵Tom Grimshaw2010-07-101-1/+1
| | | | | | | | | | | | response from a server which does not provide a valid content length header
* | | Fix an issue where the SynchronousRestObjectRequester will fail if a ↵Tom Grimshaw2010-07-101-1/+1
| | | | | | | | | | | | webserver does not report a content length (-1), but the content is still valid
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-081-2/+13
|\ \ \ | |/ /
| * | Handle a specific exception without spewing red ink.Melanie2010-07-081-2/+13
| | |
| * | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-022-6/+7
| | |
| * | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0
| |/
* | The majority of the Undo fix. There is still an issue with Rotation which ↵Tom Grimshaw2010-07-041-1/+8
| | | | | | | | i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.
* | Correct positioning of timeout modifier in the SynchronousRestObjectRequesterTom Grimshaw2010-07-041-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-07-032-26/+6
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-022-6/+7
| | |
| * | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0
| | |
* | | Re-implement the Undo stack as a List; the old implementation was buggyTom Grimshaw2010-07-031-33/+18
| | |
* | | Implement a timeout value in the SynchronousRestObjectRequester. Default is ↵Tom Grimshaw2010-07-031-1/+16
|/ / | | | | | | 100 seconds.
* | ANother stab at LSL compatibilityMelanie Thielker2010-07-011-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-06-291-1/+1
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Make newly created prims be named "Object" and make newly created scriptsMelanie Thielker2010-06-291-1/+1
| | | | | | | | | | | | have a default touch handler. Compatibility patch
* | | The other half of the asset fix. Implement an exponentially incrementing ↵Tom Grimshaw2010-06-291-0/+8
|/ / | | | | | | retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.