aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of /home/opensim/src/opensim into v3_supportBlueWall2012-02-291-2/+2
|\
| * Fix authentication for OpenID providerBlueWall2012-02-291-2/+2
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2521-103/+276
|\ \
| * | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implementedPixelTomsen2012-02-252-4/+8
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5763
| * | Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| | |
| * | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: ↵PixelTomsen2012-02-243-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-242-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-242-2/+2
| | | | | | | | | | | | returns and for consistency.
| * | Get rid of some of the identical exception catching in Scene.Update().Justin Clark-Casey (justincc)2012-02-241-17/+1
| | |
| * | Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-2410-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-241-1/+3
| | | | | | | | | | | | speed.
| * | llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTargetPixelTomsen2012-02-243-5/+33
| | |
| * | Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.Justin Clark-Casey (justincc)2012-02-231-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-233-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_supportBlueWall2012-02-2211-48/+32
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
| |\
| | * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵Justin Clark-Casey (justincc)2012-02-221-8/+2
| | | | | | | | | | | | constructor and never subsequent set to null.
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-238-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 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
| | | | | | | | This is a valid check because the caller could supply an invalid uuid.
| * Fix:LINK_ROOT flag for llGetLinkName() by SinglePrimPixelTomsen2012-02-211-1/+1
| |
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-212-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-211-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 ↵PixelTomsen2012-02-211-4/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5569
* | V3 SupportBlueWall2012-02-222-2/+22
| | | | | | | | 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.
* | V3 Support:BlueWall2012-02-212-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.
* Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-211-0/+3
| | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert.
* Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-219-14/+51
|
* Fix bug where NPCs would establish child agents on other neighbour regions ↵Justin Clark-Casey (justincc)2012-02-211-15/+14
| | | | that had come up after the NPC was created.
* Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-215-1001/+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 Canto2012-02-201-2/+5
|
* More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-202-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 Canto2012-02-191-1/+3
|
* Amend to last commit. This should have been committed too.Diva Canto2012-02-191-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-193-10/+11
|\
| * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| |
| * Fix:Fly setting for Parcel dosen't work ↵PixelTomsen2012-02-191-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 ↵PixelTomsen2012-02-191-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 Canto2012-02-193-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 Canto2012-02-182-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/opensimBlueWall2012-02-181-1/+4
|\
| * Report an error if the required native Windows ODE library can't be found.Justin Clark-Casey (justincc)2012-02-181-1/+4
| |
* | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| |
* | Propagate our teleport flags on loginsBlueWall2012-02-183-3/+12
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-175-7/+66
|\
| * Fix a bug where changing shape parameters of a child prim in a linkset would ↵Justin Clark-Casey (justincc)2012-02-181-2/+2
| | | | | | | | | | | | not persist. Resolves http://opensimulator.org/mantis/view.php?id=5819
| * On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-184-5/+64
| | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
* | Parcel sales support to SQLiteBlueWall2012-02-172-1/+10
|/
* Fillin missing SQLite support for TelehubsBlueWall2012-02-172-0/+118
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-1719-75/+400
|\
| * Add new and updated script eventsRobert Adams2012-02-172-3/+67
| |