aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-061-6/+10
|\
| * * Fixes LandDataSerializerTests on Windows by stripping CR from the ↵Teravus Ovares (Dan Olivares)2010-05-051-6/+10
| | | | | | | | | | | | serialization result since the reference serialization has LF only. * Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-051-0/+37
|\ \ | |/
| * Plumb the viewer version string through into AgentCircuitData. Now all thatMelanie Thielker2010-05-051-0/+11
| | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data.
| * * Added an important comment to warn people not to use MockConsole for ↵Teravus Ovares (Dan Olivares)2010-05-041-0/+5
| | | | | | | | anything but testing.
| * * This should fix the tests failing because of a MainConsole.Instance null ↵Teravus Ovares (Dan Olivares)2010-05-041-0/+32
| | | | | | | | | | | | reference * Added a MockConsole that doesn't require a handle to System.Console
* | Plumb the viewer version string through into AgentCircuitData. Now all thatMelanie Thielker2010-05-061-0/+11
| | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-031-0/+11
|\ \ | |/
| * Defer sending of CHANGED_OWNER to make it work on rezzed objects andMelanie2010-05-031-0/+11
| | | | | | | | attachments in addition to objects sold in place
| * Fix link security issueMelanie2010-04-301-1/+1
| |
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-301-1/+1
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-301-1/+1
| |\ \
| | * | Fix link security issueMelanie2010-04-301-1/+1
| | | |
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-192-17/+48
| |\ \ \ | | |/ /
| | * | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵Justin Clark-Casey (justincc)2010-04-162-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
| | * | Changed the GetTextureModule backport to work with the 0.6.9 codebaseJohn Hurliman2010-04-081-361/+0
| | | |
| | * | Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build breakJohn Hurliman2010-04-081-0/+361
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-291-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | * Thanks cmickeyb, for a patch that corrects an invalid construction of ↵John Hurliman2010-04-271-1/+1
| | | | | | | | | | | | | | | | Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-272-4/+9
|\ \ \ \ | |/ / /
| * | | Better error message.Diva Canto2010-04-261-1/+1
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-222-17/+48
| |\ \ \
| * | | | * Better error logging for failed SimianGrid web service callsJohn Hurliman2010-04-221-3/+8
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-195-17/+90
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵Justin Clark-Casey (justincc)2010-04-162-17/+48
| |/ / / | | | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
| * | | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.Diva Canto2010-04-141-3/+3
| | | | | | | | | | | | | | | | * PrimitiveBaseShape wants to be be committed too -- EOF.
| * | | Applying patch from lkalif to add support for inventory links to the ↵John Hurliman2010-04-131-0/+33
| | | | | | | | | | | | | | | | SimianGrid connectors
| * | | thanks lkalif for Mantis #4676 - a patch that adds support for inventory linksdahlia2010-04-121-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
| * | | minor - add some documentation to PrimitiveBaseShape constructor with ↵dahlia2010-04-091-0/+4
| | | | | | | | | | | | | | | | OpenMetaverse.Primitive parameter
* | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Test commitMelanie Thielker2010-04-051-1/+1
| | | |
| * | | Bump version numberMelanie Thielker2010-04-051-1/+1
| | | |
* | | | 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
generated by cgit v1.1 at 2024-12-30 16:23:38 +0000