aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-231-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Added overload of SendGenericMessage to LLClientView with string list as ↵Mikko Pallari2010-05-211-0/+1
| | | | | | | | parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-214-13/+49
|\ \ | |/
| * * Moving all of the prioritization/reprioritization code into a new file ↵John Hurliman2010-05-212-12/+10
| | | | | | | | | | | | | | Prioritizer.cs * Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now * Improved the distance and front back policies to always give your avatar the highest priority
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-211-0/+33
| | | | | | | | | | reused in both tests and oar code reduction in checking is outweighed by greater test clarity
| * 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 ↵unknown2010-05-151-48/+0
| | |\ | | | | | | | | | | | | slimupdates2
| | * | * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵unknown2010-05-123-217/+314
| | | | | | | | | | | | | | | | original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
| * | | Change appender to deal with line feeds more intelligently.Melanie2010-05-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change migration error reporting to not truncate the statement when reporting. It's a bit messier than the old error reporting, but at least one gets an idea of what could be wrong again. And things look a lot neater now.
| * | | Clean up output a bitMelanie2010-05-191-1/+1
| | | |
* | | | Fix for hanging on "Connecting to region".. caused by packets being ↵Tom Grimshaw2010-05-181-0/+1
| | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
* | | | When killing a zombie session, don't send the stop packet since it often has ↵Tom Grimshaw2010-05-171-0/+1
| | | | | | | | | | | | | | | | the effect of killing a newly connected client.
* | | | 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 ↵Diva Canto2010-05-091-4/+4
| | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found.
* | 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
| | | | | | | | | | | | | | CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS WITH LATER ONES. It may also eat your babies, yada, yada, yada. The usual cautions for migrations to the assets table apply. Coding: Can not guarantee nut free.
* | 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