aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-051-0/+1
|\
| * Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-051-0/+1
| |\
| | * switch flavor to RC1Justin Clark-Casey (justincc)2010-03-261-1/+1
| | |
| * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-068-23/+93
| |\ \ | | |/
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-053-8/+13
|\ \ \
| * \ \ Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-013-2/+308
| |\ \ \
| | * | | First attempt at fixing mantis #4641. It's better but there are now some ↵Diva Canto2010-03-312-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with permissions. (looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
| | * | | Committing the LightShare code, which was developed by TomMeta of Meta7.Melanie2010-03-312-2/+305
| | | | | | | | | | | | | | | | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer.
| * | | | When saving an oar/iar, don't attempt to write out the data byte array if ↵Justin Clark-Casey (justincc)2010-03-311-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | it's empty On Mono 2.6 (and probably before) this causes a non-obvious IOException
* | | | Rename Meta7Windlight to LightShareMelanie2010-03-301-5/+5
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-307-197/+23
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-261-2/+2
| |\ \ \
| | * | | change trunk version to 0.7.DevJustin Clark-Casey (justincc)2010-03-261-2/+2
| | | | |
| * | | | * Fixed a bug with null value handling in WebUtil.BuildQueryString()John Hurliman2010-03-261-2/+6
| |/ / / | | | | | | | | | | | | | | | | * Changed the null check back in estate manager setup but fixed the case for an existing account being found * Implemented SetPassword() in the SimianGrid auth connector
| * | | replace recent IModule.GetGroup() with better GetGroupRecord(string name)Justin Clark-Casey (justincc)2010-03-261-2/+0
| | | |
| * | | minor: Print out port that http servers are usingJustin Clark-Casey (justincc)2010-03-252-3/+7
| | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things
| * | | put out full exception stack if something reaches top of base http server ↵Justin Clark-Casey (justincc)2010-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
| * | | Remove the reading of estate_settings.xml and the associated processing ofMelanie2010-03-221-187/+7
| | | | | | | | | | | | | | | | | | | | defaults. Adding code to facilitate estate creation / managemment as part of first time start up
| * | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵Dan Lake2010-03-191-1/+1
| | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-183-32/+64
|\ \ \ \ | |/ / /
| * | | minor logging changes to BaseHttpServer, OSHttpRequestJustin Clark-Casey (justincc)2010-03-162-30/+58
| | | |
| * | | Fixed several unhandled exceptions and performance issues with ↵John Hurliman2010-03-161-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-refactorMelanie2010-03-156-14/+123
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-125-8/+117
| |\ \ \
| | * | | Formatting cleanup. Add copyright notices.Jeff Ames2010-03-104-8/+116
| | | | |
| * | | | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵Justin Clark-Casey (justincc)2010-03-112-5/+7
| | | | | | | | | | | | | | | | | | | | the caller that the best match for an incoming request URI is invoked
| * | | | very minor spacing adjustmentJustin Clark-Casey (justincc)2010-03-111-1/+0
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-094-0/+49
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-091-0/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-071-0/+1
| |\ \ \
| | * \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-062-0/+20
| | |\ \ \
| | * | | | - supporting llTextBoxunknown2010-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-062-0/+20
| |/ / /
* | | | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-091-0/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-061-1/+108
|\ \ \ \ | |/ / /
| * | | Fix LocalPresenceServiceConnector test now that the hardcoded test data has ↵Justin Clark-Casey (justincc)2010-03-051-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-041-1/+98
| | | | | | | | | | | | | | | | modules can use it
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-047-73/+661
|\ \ \ \ | |/ / /
| * | | minor: remove a couple of compiler warningsJustin Clark-Casey (justincc)2010-03-032-15/+5
| | | |
| * | | * 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
| * | | Removing the sLLVector3 dinosaurJohn Hurliman2010-03-032-58/+6
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0345-7935/+510
|\ \ \ \ | |/ / / | | / / | |/ / |/| | This brings careminster on the level of master. To be tested
| * | More work on GrantRights. Still not right.Diva Canto2010-03-011-34/+34
| | |
| * | Merge branch 'master' into presence-refactorMelanie2010-03-011-0/+34
| |\ \ | | |/
| | * minor formatting tweak - try to trigger a build on pandadahlia2010-02-221-1/+0
| | |
| | * add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitivedahlia2010-02-221-0/+35
| | |
| * | Change the signature of SendChangeUserRights, because we have to sendMelanie2010-02-281-1/+1
| | | | | | | | | | | | this to both parties
| * | Add missing ChangeUserRights packet senderMelanie2010-02-281-0/+1
| | |
| * | Initial Online friends notification seems to be working reliably now. All ↵Diva Canto2010-02-281-1/+3
| | | | | | | | | | | | this needs more testing, but everything is there.