aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-231-0/+1
|\
| * Added overload of SendGenericMessage to LLClientView with string list as para...Mikko Pallari2010-05-211-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-13/+49
|\ \ | |/
| * * Moving all of the prioritization/reprioritization code into a new file Prio...John Hurliman2010-05-212-12/+10
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-211-0/+33
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-211-1/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-218/+318
|\ \ | |/
| * Merging slimupdates2unknown2010-05-203-217/+314
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-151-48/+0
| | |\
| | * | * Initial commit of the slimupdates2 rewrite. This pass maintains the origina...unknown2010-05-123-217/+314
| * | | Change appender to deal with line feeds more intelligently.Melanie2010-05-191-1/+4
| * | | Clean up output a bitMelanie2010-05-191-1/+1
* | | | Fix for hanging on "Connecting to region".. caused by packets being processed...Tom Grimshaw2010-05-181-0/+1
* | | | When killing a zombie session, don't send the stop packet since it often has ...Tom Grimshaw2010-05-171-0/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-1/+1
|\ \ \ \ | |/ / /
| * | | Prevent a crash when the two agent dictionaries get out of syncMelanie2010-05-161-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-164-50/+38
|\ \ \ \ | |/ / /
| * | | Finalized the client's TCP IP address verification process for HG1.5.Diva Canto2010-05-153-2/+38
| | |/ | |/|
| * | delete now unused MessageServerInfoJustin Clark-Casey (justincc)2010-05-151-48/+0
| |/
* | 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