aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-0/+7
|\
| * on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
| |
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-2/+1
|\ \ | |/
| * Remove a merge artefaci in IsActive handling and restore commented out ↵Melanie2012-08-031-2/+1
| | | | | | | | correct one
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-5/+7
|\ \ | |/
| * minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
| |
| * clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
| | | | | | | | review later)
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-0/+10
|\ \ | |/
| * Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
| | | | | | | | out of bounds positions cause a rejection of the login.
| * Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| |
* | merge crap gerge branch 'ubitwork' of ↵ubit2012-08-02101-1375/+3578
|\ \ | |/ | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
| * Merge branch 'master' into careminsterMelanie2012-08-0113-26/+53
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-011-0/+3
| | |\
| | | * Fix a bug in pCampbot grabbing behaviour where an exception would be thrown ↵Justin Clark-Casey (justincc)2012-08-011-0/+3
| | | | | | | | | | | | | | | | if the bot was not yet aware of any objects.
| | * | Create the ability for physics modules to request assets on demand byMelanie2012-08-013-0/+22
| | |/ | | | | | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-017-12/+14
| | |\
| | | * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵Robert Adams2012-07-316-5/+3
| | | | | | | | | | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version.
| | | * BulletSim: change boolean parameters in the shape data from int's to float's ↵Robert Adams2012-07-312-7/+11
| | | | | | | | | | | | | | | | to be consistant with parameter data structure
| | * | Look up the NPC module when the SensorRepeat class is created, rather than ↵Justin Clark-Casey (justincc)2012-08-011-5/+6
| | |/ | | | | | | | | | on every single sensor sweep.
| | * Change exception log messages in XInventoryService connector to error rather ↵Justin Clark-Casey (justincc)2012-08-011-9/+8
| | | | | | | | | | | | | | | | | | than debug, since these signal real problems. Also outputs full exception instead of just the message to aid diagnostics.
| * | Merge branch 'master' into careminsterMelanie2012-08-0116-70/+288
| |\ \ | | |/
| | * Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵Justin Clark-Casey (justincc)2012-07-311-35/+43
| | | | | | | | | | | | | | | | | | | | | | | | SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep. A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal. Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status. This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
| | * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar ↵Justin Clark-Casey (justincc)2012-07-311-3/+6
| | | | | | | | | | | | | | | | | | would base its gain calculation on the previous avatar's gain, instead of the original input gain. This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
| | * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-313-2/+74
| | | | | | | | | | | | constants to the script engine.
| | * BulletSim: update the DLLs and SOs. This fixes the exception on shutdownRobert Adams2012-07-314-0/+0
| | |
| | * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| | | | | | | | | | | | | | | | | | Set ERP and CFM in linkset constraints. Reorder rebuilding of object bodies so they are not rebuilt everytime something is linked and unlinked.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-301-1/+11
| | |\
| | * | If we're fetching active gestures via the XInventoryServiceConnector, then ↵Justin Clark-Casey (justincc)2012-07-301-1/+1
| | | | | | | | | | | | | | | | properly look at the ITEMS dictionary already returned rather than the level above this.
| * | | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
| |\ \ \
| * \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-295-5/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-291-4/+10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-1/+11
| | | |_|/ | | |/| |
| * | | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-282-40/+3
| | | | |
| * | | | Add master's new binariesMelanie2012-07-284-0/+0
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-07-2870-658/+1740
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| | * | | LSL/OSSL lacks Math.Min & Math.Max implementations.SignpostMarv2012-07-283-0/+54
| | | | |
| | * | | Avoid a race condition between the scene shutdown thread and the update ↵Justin Clark-Casey (justincc)2012-07-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag.
| | * | | making first run more resilient to bad input (loop until good input, rather ↵SignpostMarv2012-07-271-7/+19
| | | | | | | | | | | | | | | | | | | | than crash)
| | * | | adding asset cache and map tile directories to .gitignoreSignpostMarv2012-07-271-0/+2
| | | | |
| | * | | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵Justin Clark-Casey (justincc)2012-07-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is always IntPtr.Zero and contacts returned always have a valid geometry. Possibly this was for a feature that was never implemented or was otherwise removed. Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
| | * | | Update OpenMetaverse libraries at commit 6212cbd, this time built on Windowsjustincc2012-07-275-0/+0
| | | | | | | | | | | | | | | | | | | | This is to try and resolve a strange Initialization exception for the AppearanceManager type that only occurs on Windows 64 bit (not Windows 32 bit or Linux!)
| | * | | minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ↵Justin Clark-Casey (justincc)2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | currently calculated dynamically
| | * | | Remove duplicated IScenePresence.PresenceType. This is already in ↵Justin Clark-Casey (justincc)2012-07-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required.
| | * | | Replace libopenmetaverse commit 6212cbd with the same libraries but this ↵Justin Clark-Casey (justincc)2012-07-274-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time built with xbuild rather than nant. This may fix Windows and some mono version builds.
| | * | | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-272-3/+0
| | | | |
| | * | | Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012)Justin Clark-Casey (justincc)2012-07-274-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Built from https://github.com/openmetaversefoundation/libopenmetaverse/commits/master This update incorporates a fix by Melanie in libomv where textures would sometimes rotate slightly when other properties were changed. Hence addresses http://opensimulator.org/mantis/view.php?id=6100 This update also incorporates libomv bot code updates that significantly reduce the warning spam for pCampbot. The change rate of libomv is low and many changes refer to bot or code not used by OpenSimulator, so I think it is sufficiently stable to use evne though it's not a release.
| | * | | Add autoclean for scripted useBlueWall2012-07-261-0/+13
| | | | | | | | | | | | | | | | | | | | ./runprebuild.sh autoclean - cleans projects w/o prompting
| | * | | Add target switchesBlueWall2012-07-261-0/+11
| | | | | | | | | | | | | | | | | | | | ./runprebuild.sh vs2008/vs2010 to set the target
| | * | | add clean task to reuprebuild.shBlueWall2012-07-261-2/+16
| | | | | | | | | | | | | | | | | | | | ./runprebuild.sh clean to clean up the project files
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-277-237/+429
| | |\ \ \
generated by cgit v1.1 at 2024-12-29 17:09:55 +0000