aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Make RegionLightShareData serializableTom Grimshaw2010-06-261-0/+1
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-253-9/+15
|\
| * fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
| |
| * Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| | | | | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d.
| * Report http server onRequest() exception properly.Justin Clark-Casey (justincc)2010-06-251-1/+1
| |
| * minor: Move log information about SYSTEMIP to the place where it's resolvedJustin Clark-Casey (justincc)2010-06-251-7/+13
| |
| * * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵John Hurliman2010-06-241-1/+1
| | | | | | | | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message
* | Make "Allow other residents to edit terrain" default to FALSETom Grimshaw2010-06-251-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-171-0/+7
|\ \ | |/
| * Force newly connecting remote consoles to display a promptMelanie2010-06-171-0/+7
| |
| * Readjust master version and flavorMelanie2010-06-151-2/+2
| |
| * Change flavor to 0.7-RC1Melanie2010-06-121-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\ \ | | | | | | | | | 0.7.1CM Dev
| * | Change trunk versio to 0.7.1 DevMelanie2010-06-121-2/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-0/+2
|\ \ | |/
| * Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packetMelanie2010-06-121-0/+2
| | | | | | | | we used to send before slimupdates and explicitly send it
| * Make the text mode remote console really work. It can now be used to sendMelanie Thielker2010-06-081-14/+22
| | | | | | | | | | multi-word commands with proper quoting, handles arguments with spaces and allows interactive use, e.g. user creation.
* | Make the text mode remote console really work. It can now be used to sendMelanie Thielker2010-06-081-14/+22
| | | | | | | | | | multi-word commands with proper quoting, handles arguments with spaces and allows interactive use, e.g. user creation.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-282-3/+16
|\ \ | |/
| * If a command has descriptive help, add a line above and below the print out ↵Justin Clark-Casey (justincc)2010-05-281-0/+10
| | | | | | | | for readability
| * Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-281-2/+1
| | | | | | | | | | | | | | | | So, something like load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar Will load my IAR directly from the web.
| * add a smidgen more log debug information in the form of the operating system ↵Justin Clark-Casey (justincc)2010-05-281-1/+5
| | | | | | | | version
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-231-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Added overload of SendGenericMessage to LLClientView with string list as ↵Mikko Pallari2010-05-211-0/+1
| | | | | | | | parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-13/+49
|\ \ | |/
| * * Moving all of the prioritization/reprioritization code into a new file ↵John Hurliman2010-05-212-12/+10
| | | | | | | | | | | | | | Prioritizer.cs * Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now * Improved the distance and front back policies to always give your avatar the highest priority
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-211-0/+33
| | | | | | | | | | reused in both tests and oar code reduction in checking is outweighed by greater test clarity
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-211-1/+6
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-218/+318
|\ \ | |/
| * Merging slimupdates2unknown2010-05-203-217/+314
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵unknown2010-05-151-48/+0
| | |\ | | | | | | | | | | | | slimupdates2
| | * | * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵unknown2010-05-123-217/+314
| | | | | | | | | | | | | | | | original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
| * | | Change appender to deal with line feeds more intelligently.Melanie2010-05-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change migration error reporting to not truncate the statement when reporting. It's a bit messier than the old error reporting, but at least one gets an idea of what could be wrong again. And things look a lot neater now.
| * | | Clean up output a bitMelanie2010-05-191-1/+1
| | | |
* | | | Fix for hanging on "Connecting to region".. caused by packets being ↵Tom Grimshaw2010-05-181-0/+1
| | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
* | | | When killing a zombie session, don't send the stop packet since it often has ↵Tom Grimshaw2010-05-171-0/+1
| | | | | | | | | | | | | | | | the effect of killing a newly connected client.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-1/+1
|\ \ \ \ | |/ / /
| * | | Prevent a crash when the two agent dictionaries get out of syncMelanie2010-05-161-1/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-164-50/+38
|\ \ \ \ | |/ / /
| * | | Finalized the client's TCP IP address verification process for HG1.5.Diva Canto2010-05-153-2/+38
| | |/ | |/|
| * | delete now unused MessageServerInfoJustin Clark-Casey (justincc)2010-05-151-48/+0
| |/