Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /home/opensim/src/opensim into v3_support | BlueWall | 2012-02-29 | 1 | -2/+2 |
|\ | |||||
| * | Fix authentication for OpenID provider | BlueWall | 2012-02-29 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support | BlueWall | 2012-02-25 | 44 | -121/+300 |
|\ \ | |||||
| * | | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented | PixelTomsen | 2012-02-25 | 2 | -4/+8 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5763 | ||||
| * | | Move libopenjpeg native libraries into lib32 and lib64 as appropriate. | Justin Clark-Casey (justincc) | 2012-02-25 | 5 | -5/+5 |
| | | | |||||
| * | | Remove some more unused Bullet libraries. | Justin Clark-Casey (justincc) | 2012-02-25 | 3 | -0/+0 |
| | | | |||||
| * | | Remove old libbulletnet native libraries. These are not used in the current ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 2 | -0/+0 |
| | | | | | | | | | | | | generation bullet physics plugin. | ||||
| * | | Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 9 | -9/+9 |
| | | | | | | | | | | | | appropriate. | ||||
| * | | Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like ↵ | Justin Clark-Casey (justincc) | 2012-02-25 | 3 | -0/+0 |
| | | | | | | | | | | | | these were once connected with HttpServer.dll but are now unused. | ||||
| * | | Remove EXPERIMENTAL tags from load iar/save iar commands. | Justin Clark-Casey (justincc) | 2012-02-25 | 1 | -3/+0 |
| | | | |||||
| * | | Establish a distsrc nant target for producing the source distribution. | Justin Clark-Casey (justincc) | 2012-02-25 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | This is in addition to the distbin target. The distbin target now needs distsrc to be run first. Still needs some extra tweaking that I shall eventually put in as sed invocations or similar. | ||||
| * | | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: ↵ | PixelTomsen | 2012-02-24 | 3 | -27/+105 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754 | ||||
| * | | Take watchdog alarm calling back outside the m_threads lock. | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -5/+18 |
| | | | | | | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem. | ||||
| * | | Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵ | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -2/+2 |
| | | | | | | | | | | | | returns and for consistency. | ||||
| * | | Get rid of some of the identical exception catching in Scene.Update(). | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -17/+1 |
| | | | |||||
| * | | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 10 | -26/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout. | ||||
| * | | In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set ↵ | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -1/+3 |
| | | | | | | | | | | | | speed. | ||||
| * | | llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget | PixelTomsen | 2012-02-24 | 3 | -5/+33 |
| | | | |||||
| * | | Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule. | Justin Clark-Casey (justincc) | 2012-02-23 | 1 | -0/+3 |
| | | | | | | | | | | | | This should resolve http://opensimulator.org/mantis/view.php?id=5901 | ||||
| * | | Try to resolve some problems with viewers crashing after hitting parcel ↵ | Justin Clark-Casey (justincc) | 2012-02-23 | 3 | -16/+41 |
| |/ | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822 | ||||
* | | Merge branch 'master' into v3_support | BlueWall | 2012-02-22 | 11 | -48/+32 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-23 | 1 | -8/+2 |
| |\ | |||||
| | * | Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵ | Justin Clark-Casey (justincc) | 2012-02-22 | 1 | -8/+2 |
| | | | | | | | | | | | | constructor and never subsequent set to null. | ||||
| * | | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 8 | -18/+25 |
| |/ | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high. | ||||
| * | Restore the taskItem null check that I accidentally blatted in 5397a6d | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+9 |
| | | | | | | | | This is a valid check because the caller could supply an invalid uuid. | ||||
| * | Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim | PixelTomsen | 2012-02-21 | 1 | -1/+1 |
| | | |||||
| * | Fix problem with dragging child part inventory item to user inventory. | Justin Clark-Casey (justincc) | 2012-02-21 | 2 | -30/+4 |
| | | | | | | | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569 | ||||
| * | Revert "Fix:Cannot drag inventory from child prim into inventory ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way. | ||||
| * | Fix:Cannot drag inventory from child prim into inventory ↵ | PixelTomsen | 2012-02-21 | 1 | -4/+8 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569 | ||||
* | | V3 Support | BlueWall | 2012-02-22 | 3 | -2/+25 |
| | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response. | ||||
* | | Add web profile url setting to ini | BlueWall | 2012-02-21 | 1 | -0/+3 |
| | | |||||
* | | V3 Support: | BlueWall | 2012-02-21 | 2 | -2/+22 |
|/ | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on. | ||||
* | Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+0 |
| | | | | bit one in lib64 | ||||
* | Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate. | Justin Clark-Casey (justincc) | 2012-02-21 | 3 | -0/+3 |
| | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert. | ||||
* | Replace previous windows 64-bit sqlite3.dll with one from ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+0 |
| | | | | | | | | | http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not. This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference. This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet). | ||||
* | Replace win 64-bit sqlite3.dll with another version, though I suspect this ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+0 |
| | | | | one won't work either. | ||||
* | Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. | Justin Clark-Casey (justincc) | 2012-02-21 | 11 | -14/+51 |
| | |||||
* | Fix bug where NPCs would establish child agents on other neighbour regions ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -15/+14 |
| | | | | that had come up after the NPC was created. | ||||
* | Remove PhysXPlugin and wrappers. | Justin Clark-Casey (justincc) | 2012-02-21 | 8 | -1026/+0 |
| | | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support. | ||||
* | Amend to last commit: synchronize access to queues. | Diva Canto | 2012-02-20 | 1 | -2/+5 |
| | |||||
* | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 2 | -11/+16 |
| | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | ||||
* | One more tweak related to the previous 2 commits. | Diva Canto | 2012-02-19 | 1 | -1/+3 |
| | |||||
* | Amend to last commit. This should have been committed too. | Diva Canto | 2012-02-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-02-19 | 3 | -10/+11 |
|\ | |||||
| * | Use localy defined name, TPFlags, for Constants.TeleportFlags | BlueWall | 2012-02-19 | 1 | -6/+6 |
| | | |||||
| * | Fix:Fly setting for Parcel dosen't work ↵ | PixelTomsen | 2012-02-19 | 1 | -1/+2 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5887 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| * | Fix:OmegaX, OmegaY and OmegaZ not saved for child prims ↵ | PixelTomsen | 2012-02-19 | 1 | -3/+3 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5893 Signed-off-by: nebadon <michael@osgrid.org> | ||||
* | | A few more tweaks on position updates and create child agents. Mono hates ↵ | Diva Canto | 2012-02-19 | 3 | -11/+23 |
|/ | | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours. | ||||
* | This should smooth movement in heteregeneous networks by a lot: cache the ↵ | Diva Canto | 2012-02-18 | 2 | -2/+40 |
| | | | | region by position instead of looking it up all the time -- this was being done during the main update loop! | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-02-18 | 2 | -1/+4 |
|\ |