aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0938-53/+347
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-099-12/+13
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-099-7/+111
| | |\
| | * | * Typo fixesJohn Hurliman2010-03-099-12/+13
| | | | | | | | | | | | | | | | * Performance improvement in the expensive GenerateClientFlags()
| * | | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-0912-11/+333
| | |/ | |/| | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData ↵unknown2010-03-097-3/+101
| | | | | | | | | | | | | | | | | | placeholder added. Signed-off-by: Melanie <melanie@t-data.com>
| * | Comment a debug message that is a tad too spammyMelanie2010-03-081-1/+1
| | |
| * | Add config option for switching between CSJ2K and BuggyJPEG.Melanie2010-03-081-3/+9
| |/
| * * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently ↵John Hurliman2010-03-071-20/+33
| | | | | | | | hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-0713-6/+109
| |\
| | * Bug fix: correct name of methods in user accounts connector.Diva Canto2010-03-071-1/+1
| | |
| | * Small consistency changeMelanie2010-03-071-2/+2
| | |
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-066-13/+58
| | |\
| | * | - supporting llTextBoxunknown2010-03-0612-3/+106
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit ↵John Hurliman2010-03-071-0/+28
| | |/ | |/| | | | | | | systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
| * | Bug fix: store correct position information upon logout. Fixes mantis #4608Diva Canto2010-03-066-13/+58
| |/
* | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-0912-10/+333
| |
* | Revert "Adds Land Banning."Melanie2010-03-092-120/+58
| | | | | | | | This reverts commit a87d7a12967b50fe83ebbaa7b57e531eb93158a2.
* | Revert "Adds land ejection and freezing. Adds more checks to land banning."Melanie2010-03-091-103/+25
| | | | | | | | This reverts commit 44d523518af31075c77653eacc7489220db4abaa.
* | 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
| | | |