aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-4/+4
|\
| * * Fixed spamming the assets table with map tiles. The tile image ID is now st...Diva Canto2010-05-091-4/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-091-0/+22
|\ \ | |/
| * Add a field asset_flags and a corresponding enum to the asset database. ThisMelanie2010-05-091-0/+22
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-061-6/+10
|\ \ | |/
| * * Fixes LandDataSerializerTests on Windows by stripping CR from the serializa...Teravus Ovares (Dan Olivares)2010-05-051-6/+10
* | 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
| * * Added an important comment to warn people not to use MockConsole for anythi...Teravus Ovares (Dan Olivares)2010-05-041-0/+5
| * * This should fix the tests failing because of a MainConsole.Instance null re...Teravus Ovares (Dan Olivares)2010-05-041-0/+32
* | Plumb the viewer version string through into AgentCircuitData. Now all thatMelanie Thielker2010-05-061-0/+11
* | 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
| * 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 OpenSim.Grid.UserS...Justin Clark-Casey (justincc)2010-04-162-17/+48
| | * | 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 Primi...John Hurliman2010-04-271-1/+1
* | | | 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 OpenSim.Grid.UserS...Justin Clark-Casey (justincc)2010-04-162-17/+48
| |/ / /
| * | | * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.Diva Canto2010-04-141-3/+3
| * | | Applying patch from lkalif to add support for inventory links to the SimianGr...John Hurliman2010-04-131-0/+33
| * | | thanks lkalif for Mantis #4676 - a patch that adds support for inventory linksdahlia2010-04-121-0/+5
| * | | minor - add some documentation to PrimitiveBaseShape constructor with OpenMet...dahlia2010-04-091-0/+4
* | | | 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 issu...Diva Canto2010-03-312-7/+10
| | * | | Committing the LightShare code, which was developed by TomMeta of Meta7.Melanie2010-03-312-2/+305
| * | | | When saving an oar/iar, don't attempt to write out the data byte array if it'...Justin Clark-Casey (justincc)2010-03-311-1/+3
| |/ / /
* | | | 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
| |/ / /
generated by cgit v1.1 at 2024-09-25 21:15:20 +0000