aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Closing more streams.Diva Canto2009-10-031-4/+27
|/ /
* | Small permissions tweakMelanie2009-10-031-1/+4
| |
* | Merge branch 'diva-textures-osgrid'Melanie2009-10-031-126/+88
|\ \ | |/
| * Merge branch 'diva-textures-osgrid' of ↵John Hurliman2009-10-021-6/+20
| |\ | | | | | | | | | ssh://opensimulator.org/var/git/opensim into diva-textures-osgrid
| * | * Removed code that is no longer used with Melanie's queue callback optimizationJohn Hurliman2009-10-021-126/+88
| | | | | | | | | | | | | | | * Moved all priority queue access to helper functions to improve reliability and readability * New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
* | | Merge branch 'diva-textures-osgrid'Melanie2009-10-023-188/+162
|\ \ \ | | |/ | |/|
| * | Merge branch 'diva-textures-osgrid' of ↵Diva Canto2009-10-025-241/+161
| |\ \ | | |/ | | | | | | ssh://diva@opensimulator.org/var/git/opensim into diva-textures-osgrid
| | * * Removed even more unnecessary state variables from J2KImageJohn Hurliman2009-10-022-182/+142
| | | | | | | | | | | | | | | * Fixed the incorrect "out of memory?" exception messages and replaced them with useful information * Cleaned up J2KImage and LLImageManager to conform to coding conventions
| * | Close streams in MakeRequest.Diva Canto2009-10-021-6/+20
| | |
* | | Merge branch 'master' into diva-texturesMelanie2009-10-0227-396/+477
|\ \ \
| * | | reducing script engine log spamdr scofield (aka dirk husemann)2009-10-021-4/+4
| | | |
| * | | reducing region DB log spamdr scofield (aka dirk husemann)2009-10-022-2/+2
| | | |
| * | | fixing TestLandChannel to let it return empty List<ILandObject>() (asdr scofield (aka dirk husemann)2009-10-022-6/+42
| | | | | | | | | | | | | | | | does the real LandChannel), percolating to SceneSetupHelpers.
| * | | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-0224-384/+429
| | | | | | | | | | | | | | | | - adding LandDataSerializer to OAR mechanics
* | | | Merge branch 'diva-textures-osgrid' into diva-texturesMelanie2009-10-023-59/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | * Changed the flush logic to drop packets in non-transactional streams, and ↵John Hurliman2009-10-023-59/+19
| | |/ | |/| | | | | | | | | | | | | to not fire any "put more data in the queues" callbacks * Minor tweaks to code formatting to make the callback chain for packet queuing easier to follow
* | | Merge branch 'master' into diva-texturesMelanie2009-10-02341-5746/+8101
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-10-026-46/+28
| |\
| | * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-022-14/+21
| | |\
| | * | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-026-46/+28
| | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
| * | | * Attempting to fix a issue with console commands & the estate module. Again.Adam Frisby2009-10-021-4/+52
| | |/ | |/|
| * | Added messages to assertions in the failing tests, so that we know which ↵Diva Canto2009-10-011-12/+19
| | | | | | | | | | | | ones are failing.
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-10-011-0/+44
| |\ \ | | |/
| | * Add "dump asset" command to remote asset connector (the only one that uses aMelanie2009-10-011-0/+44
| | | | | | | | | | | | cache at all)
| * | Switched log level of an annoying message in SQLite to Debug, and commented ↵Diva Canto2009-10-011-2/+2
| |/ | | | | | | it too.
| * Catch and print exceptions in MessagingService, to diagnose mysterious ↵Diva Canto2009-10-011-35/+51
| | | | | | | | disappearances of the Messaging server.
| * - adding new LandDataSerializer testcase to "test-xml" target as welldr scofield (aka dirk husemann)2009-10-012-14/+52
| | | | | | | | - adding another LandDataSerializer testcase
| * fixing LandDataSerializer (yeah! for testcases)dr scofield (aka dirk husemann)2009-10-012-19/+29
| |
| * Merge branch 'oar-parcel' into x-opensimdr scofield (aka dirk husemann)2009-10-011-1/+4
| |\
| | * adding meat to the LandDataSerializerTest cases.dr scofield (aka dirk husemann)2009-10-011-1/+4
| | |
| * | Merge branch 'oar-parcel' into x-opensimdr scofield (aka dirk husemann)2009-10-012-32/+118
| |\ \ | | |/
| | * adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)dr scofield (aka dirk husemann)2009-10-012-32/+118
| | |
| * | Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-5/+4
| | | | | | | | | | | | | | | | | | Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3036-48/+48
| |\ \
| | * | Formatting cleanup.Jeff Ames2009-10-0136-48/+48
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-30344-7642/+7898
| |\ \ \ | | |/ /
| | * | Formatting cleanup.Jeff Ames2009-10-01223-930/+875
| | |/
| | * adding LandDataSerializer (not connected anywhere, work-in-progress)dr scofield (aka dirk husemann)2009-09-301-0/+185
| | | | | | | | | | | | [hi, there, justin!]
| | * Make create user to the Right Thing with regard to salting user passwordsMelanie2009-09-301-2/+4
| | |
| | * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-09-302-1/+4
| | |\
| | | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-291-1/+1
| | | |\
| | | * | Minor bug fixes.Diva Canto2009-09-292-1/+4
| | | | |
| | * | | Change command help text to show .ini in place of .xml when creating regionsMelanie2009-09-301-2/+2
| | | |/ | | |/|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensimdr scofield (aka dirk husemann)2009-09-293-1/+42
| | |\ \ | | | |/
| | | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-291-4/+7
| | | |\
| | | * | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵Diva Canto2009-09-293-1/+42
| | | | | | | | | | | | | | | | | | | | phantom after an import to megaregions.
| | * | | This fix addresses the problem where phantom objects do notAlan M Webb2009-09-291-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
| | * | Given the perverse way that strided works, ifAlan M Webb2009-09-291-4/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | there is only one element in the range, it must also coincide with the specified stride. The existing code assumes that the stride starts at start ( which is the expected and most useful behavior). Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
| | * Remove empty CheckSumServer.cs file.Jeff Ames2009-09-291-26/+0
| | |
| | * Fix loading modules with alternate configurations and ports into ROBUST.Melanie2009-09-2914-55/+75
| | | | | | | | | | | | Make all current modules support the configuration name option