aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Small consistency changeMelanie2010-03-071-2/+2
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0630-427/+1256
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-0626-405/+1137
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-03-053-20/+28
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-0514-240/+885
| | | |\
| | | * | * Cache packed throttle data to avoid repeated allocations in ↵John Hurliman2010-03-052-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CheckForSignificantMovement() * Removed a lock on "return m_neighbours.Count" in GetInaccurateNeighborCount(). Dictionary<>.Count by itself does not benefit from locking
| | | * | * Fixed an order of operations bug in CheckForSignificantMovement() that was ↵John Hurliman2010-03-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing a flood of child updates to neighbors on login * Removed an unnecessary call to the presence service
| | * | | Justin, I must have been dyslexic when I wrote UserGridService as the name ↵Diva Canto2010-03-057-48/+48
| | | |/ | | |/| | | | | | | | | for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.
| | * | refactor: Move DetachSingleAttachmentToInv to region moduleJustin Clark-Casey (justincc)2010-03-066-78/+82
| | | | | | | | | | | | | | | | need to rationalize method names later
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-051-1/+1
| | |\ \ | | | |/
| | | * Bug fix on user account creation -- ServiceURLs field now properly filled out.Diva Canto2010-03-041-1/+1
| | | |
| | * | refactor: move another AttachObject methodJustin Clark-Casey (justincc)2010-03-052-45/+46
| | | |
| | * | refactor: move user inventory side of RezSingleAttachment to moduleJustin Clark-Casey (justincc)2010-03-053-29/+43
| | | |
| | * | refactor: begin to move attachments code into a region moduleJustin Clark-Casey (justincc)2010-03-056-102/+205
| | | |
| | * | add initial UserGrid service classes as per diva's directionJustin Clark-Casey (justincc)2010-03-058-2/+525
| | |/ | | | | | | | | | | | | this will initially store home location data instead of the presence service compiles but not enough to actually test yet
| | * Fix LocalPresenceServiceConnector test now that the hardcoded test data has ↵Justin Clark-Casey (justincc)2010-03-056-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | been removed from Data.Null.NullPresenceData Unfortunately, this meant publicly exposing the underlying service for the connector. The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config. Unfortunately, this would require a lot of work in this case but might be the better way forward.
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-051-1/+0
| | |\
| | * | minor: comment out a forgotton debug log lineJustin Clark-Casey (justincc)2010-03-041-1/+1
| | | |
| | * | remove test presence from NullPresenceData since this appears to stop ↵Justin Clark-Casey (justincc)2010-03-043-14/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | existing sessions with home locations from being picked up only tested for a single user so this may still fail for multiple users this may well be all academic anyway since standalone need to persistently store home location in presence data in some way
| | * | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵Justin Clark-Casey (justincc)2010-03-045-109/+123
| | | | | | | | | | | | | | | | modules can use it
| * | | - implementing server 1.38 functionsunknown2010-03-065-10/+119
| | |/ | |/| | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0423-241/+945
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-0422-227/+940
| |\ \ | | |/
| | * compiler warnings revealed that public PlaySoundSlavePrims properties were ↵Justin Clark-Casey (justincc)2010-03-032-4/+4
| | | | | | | | | | | | | | | | | | changing the wrong protected fields. correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
| | * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-03-031-7/+7
| | |
| | * refactor: push sog.SendPartFullUpdate() down into sop where it better belongsJustin Clark-Casey (justincc)2010-03-032-45/+43
| | | | | | | | | | | | no functional changes
| | * minor: remove a couple of compiler warningsJustin Clark-Casey (justincc)2010-03-032-15/+5
| | |
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-036-95/+672
| | |\
| | | * * Added three new helper utility files to OpenSim.Framework. MultipartForm ↵John Hurliman2010-03-033-0/+650
| | | | | | | | | | | | | | | | is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams
| | | * * Adjusted the significant movement magic value from 0.5m to 2.0m and added ↵John Hurliman2010-03-031-1/+6
| | | | | | | | | | | | | | | | an explanation of what it does
| | | * Removing the sLLVector3 dinosaurJohn Hurliman2010-03-033-61/+9
| | | |
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-035-9/+41
| | | |\
| | | * | * Fixed bad start position clamping in MakeRootAgent()John Hurliman2010-03-031-33/+7
| | | | |
| | * | | Fix bug where approximately half the time, attachments would rez only their ↵Justin Clark-Casey (justincc)2010-03-035-38/+140
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
| | * | Actually make EventManager.OnAttach() fire when an object is attached. ↵Justin Clark-Casey (justincc)2010-03-031-0/+3
| | | | | | | | | | | | | | | | Previously, only detach was firing!
| | * | Make the service loader pump out the error to the log (in red) and include ↵Justin Clark-Casey (justincc)2010-03-032-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | the dll/interface/args that caused the problem This gives people more of a fighting chance of finding out what went wrong
| | * | remove references to OpenSim.Framework.Commuications.Tests.dll since all ↵Justin Clark-Casey (justincc)2010-03-032-4/+14
| | |/ | | | | | | | | | | | | | | | relevant test code has been obsoleted this allows the tests to pass on my local system
| | * Added empty service URLs upon account creation.Diva Canto2010-03-031-0/+9
| | |
| | * More debug.Diva Canto2010-03-021-0/+1
| | |
| | * Better error handling on PasswordAuthenticationServiceDiva Canto2010-03-021-14/+18
| | |
| * | Remove a superfluous array creationMelanie2010-03-041-1/+0
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-031-1/+1
|\ \ | |/
| * * Better debug message on login problems.Diva Canto2010-03-021-1/+1
| | | | | | | | * Moved GridInfoService config to OpenSim.Server.ini
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-03488-46282/+25370
|\ \ | |/ | | | | This brings careminster on the level of master. To be tested
| * Fixes Region.Framework tests. Although these tests don't fail, they need to ↵Diva Canto2010-03-022-16/+17
| | | | | | | | be rewritten, because they are doing agent manipulations in the wrong way, so they're fairly meaningless.
| * Fixed SQL tests.Diva Canto2010-03-021-4/+1
| |
| * Merge branch 'presence-refactor' of ↵Diva Canto2010-03-013-9/+0
| |\ | | | | | | | | | ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
| | * Merge branch 'master' into presence-refactorMelanie2010-03-023-9/+0
| | |\
| | | * Fix a few compiler warnings.Jeff Ames2010-03-013-9/+0
| | | |
| * | | Offline friendship offers now working.Diva Canto2010-03-011-8/+41
| |/ /