Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 3 | -32/+64 |
|\ | |||||
| * | minor logging changes to BaseHttpServer, OSHttpRequest | Justin Clark-Casey (justincc) | 2010-03-16 | 2 | -30/+58 |
| | | |||||
| * | Fixed several unhandled exceptions and performance issues with ↵ | John Hurliman | 2010-03-16 | 1 | -2/+6 |
| | | | | | | | | PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 6 | -14/+123 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 5 | -8/+117 |
| |\ | |||||
| | * | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 4 | -8/+116 |
| | | | |||||
| * | | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵ | Justin Clark-Casey (justincc) | 2010-03-11 | 2 | -5/+7 |
| | | | | | | | | | | | | the caller that the best match for an incoming request URI is invoked | ||||
| * | | very minor spacing adjustment | Justin Clark-Casey (justincc) | 2010-03-11 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-09 | 4 | -0/+49 |
|\ \ \ | | |/ | |/| | |||||
| * | | - parcel blocking, region crossing blocking, teleport blocking | unknown | 2010-03-09 | 1 | -0/+1 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-07 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-06 | 2 | -0/+20 |
| | |\ | |||||
| | * | | - supporting llTextBox | unknown | 2010-03-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit ↵ | John Hurliman | 2010-03-07 | 1 | -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 #4608 | Diva Canto | 2010-03-06 | 2 | -0/+20 |
| |/ | |||||
* | | - parcel blocking, region crossing blocking, teleport blocking | unknown | 2010-03-09 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 1 | -1/+108 |
|\ \ | |/ | |||||
| * | Fix LocalPresenceServiceConnector test now that the hardcoded test data has ↵ | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | 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. | ||||
| * | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-03-04 | 1 | -1/+98 |
| | | | | | | | | modules can use it | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 7 | -73/+661 |
|\ \ | |/ | |||||
| * | minor: remove a couple of compiler warnings | Justin Clark-Casey (justincc) | 2010-03-03 | 2 | -15/+5 |
| | | |||||
| * | * Added three new helper utility files to OpenSim.Framework. MultipartForm ↵ | John Hurliman | 2010-03-03 | 3 | -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 | ||||
| * | Removing the sLLVector3 dinosaur | John Hurliman | 2010-03-03 | 2 | -58/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 45 | -7935/+510 |
|\ \ | |/ | | | | | This brings careminster on the level of master. To be tested | ||||
| * | More work on GrantRights. Still not right. | Diva Canto | 2010-03-01 | 1 | -34/+34 |
| | | |||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-03-01 | 1 | -0/+34 |
| |\ | |||||
| | * | minor formatting tweak - try to trigger a build on panda | dahlia | 2010-02-22 | 1 | -1/+0 |
| | | | |||||
| | * | add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive | dahlia | 2010-02-22 | 1 | -0/+35 |
| | | | |||||
| * | | Change the signature of SendChangeUserRights, because we have to send | Melanie | 2010-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | this to both parties | ||||
| * | | Add missing ChangeUserRights packet sender | Melanie | 2010-02-28 | 1 | -0/+1 |
| | | | |||||
| * | | Initial Online friends notification seems to be working reliably now. All ↵ | Diva Canto | 2010-02-28 | 1 | -1/+3 |
| | | | | | | | | | | | | this needs more testing, but everything is there. | ||||
| * | | Remove the overlooked remnants of core profile support | Melanie | 2010-02-24 | 1 | -37/+0 |
| | | | |||||
| * | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 4 | -7/+10 |
| | | | |||||
| * | | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim ↵ | John Hurliman | 2010-02-22 | 6 | -122/+23 |
| |\ \ | | | | | | | | | | | | | into presence-refactor | ||||
| | * \ | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 5 | -18/+23 |
| | |\ \ | | | |/ | | | | | | | | | This brings presence-refactor up to master again | ||||
| | | * | Change handling of the SYSTEMIP constant to be more sane. | Melanie | 2010-02-18 | 2 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | This will now choose the first network interface IP address, or the loopback interface if no external interfaces are found. It will log the IP address used as [NETWORK]: Using x.x.x.x for SYSTEMIP. | ||||
| | | * | Revert "change "SYSTEMIP" to "localhost" in the create region console ↵ | Melanie | 2010-02-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | command prompt" after speaking to Dahlia This reverts commit c62a6adb2b234fcbe99e352f4bd2af0cbf683a99. | ||||
| | | * | change "SYSTEMIP" to "localhost" in the create region console command prompt | dahlia | 2010-02-17 | 1 | -4/+4 |
| | | | | |||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 3 | -11/+11 |
| | | | | |||||
| | * | | Deleted obsolete files in the Data layer. Compiles. | Diva Canto | 2010-02-21 | 1 | -104/+0 |
| | | | | |||||
| * | | | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 5 | -20/+13 |
| |/ / | | | | | | | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
| * | | * Added a sanity check for missing asset data in LLClientView | John Hurliman | 2010-02-20 | 2 | -2/+200 |
| | | | | | | | | | | | | | | | * Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil * Linked content type to asset type in AssetMetadata | ||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-15 | 5 | -30/+53 |
| |\ \ | | |/ | |||||
| | * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 3 | -5/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Deleted unused class that came back because of merge conflicts. | Diva Canto | 2010-02-08 | 1 | -755/+0 |
| | | | |||||
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 4 | -2/+763 |
| |\ \ | | | | | | | | | | | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | ||||
| * | | | Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as ↵ | Diva Canto | 2010-01-31 | 2 | -26/+0 |
| | | | | | | | | | | | | | | | | lots of other obsolete configs. | ||||
| * | | | Changed an error message to w warning message. | Diva Canto | 2010-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | * HGGridConnector is no longer necessary. | Diva Canto | 2010-01-29 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | * Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken. | ||||
| * | | | Works for grid login. | Diva Canto | 2010-01-29 | 1 | -9/+15 |
| | | | |