aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-08-243-3/+39
|\
| * Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
| |
* | Merge branch 'master' into careminsterMelanie2012-08-241-2/+25
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | If a script state save fails for some reason on shutdown/region removal, get ↵Justin Clark-Casey (justincc)2012-08-231-2/+25
| | | | | | | | | | | | xengine to spit out some useful information and continue to save other script states
* | | Merge branch 'master' into careminsterMelanie2012-08-2318-81/+199
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | this should be an if-else block in case the non-phys min/max are smaller ↵SignpostMarv2012-08-221-5/+7
| | | | | | | | | | | | than the physical min/max
| * | Lock disposal of separate gdi+ objects under different threads since this ↵Justin Clark-Casey (justincc)2012-08-221-26/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevents malloc heap corruption seen under Ubuntu 10.04.1 and 11.04 - probably a libcairo issue In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously, the native malloc heap can become corrupted, possibly due to a double free(). This may be due to bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX. These problems were seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1. They go away if disposal is perfomed under lock.
| * | Fix bug in SoundModule.PlayAttachedSound() where every sound update to an ↵Justin Clark-Casey (justincc)2012-08-211-3/+5
| | | | | | | | | | | | | | | | | | avatar would base its gain calculation on the previous avatar's gain, instead of the original input gain This is similar to commit d89faa which fixed the same kind of bug in TriggerSound()
| * | refactoring out SetFaceColorSignpostMarv2012-08-202-54/+17
| | |
| * | making use of implicit operators and Util.Clip handling of Vector3SignpostMarv2012-08-202-22/+27
| | |
| * | single operation for PRIM_COLORSignpostMarv2012-08-202-2/+50
| | |
| * | fix typoSignpostMarv2012-08-201-1/+1
| | |
| * | no-op change for cia.vc testJustin Clark-Casey (justincc)2012-08-201-0/+1
| | |
| * | When loading an OAR, validate any group UUIDs and properly reconstruct ↵Justin Clark-Casey (justincc)2012-08-201-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel access lists. If a group UUID is present that is not on this simulator then the object or parcel is no longer group owned. This is a change from previous behaviour where such invalid UUIDs were kept. This is an adaptation of patch 0002 from http://opensimulator.org/mantis/view.php?id=6105 by Oren Hurvitz of Kitely. My adaptations are formatting only, apart from the notices about parcel owner IDs not being saved since this has now been fixed. Thanks Oren.
| * | Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-2011-22/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
| * | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
| | |
| * | Fix llDialog responses so that they can be heard throughout the region. This ↵Melanie2012-08-191-1/+1
| | | | | | | | | | | | now conforms to the behaviour in SL.
| * | Add a reference to OpenMetaverseType.dll to compiled script assemblies.Melanie2012-08-181-0/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-08-236-3/+26
|\ \ \ | | |/ | |/|
| * | Make terrain save every 1000 frames instead of every 50. Database load is a ↵Melanie2012-08-221-1/+1
| | | | | | | | | | | | sim killer.
| * | Fix group return stuffMelanie2012-08-211-1/+1
| | |
| * | Allow updates sent for right pec to go to the clientMelanie2012-08-211-1/+1
| | |
| * | Implement seeing busy status in LSLMelanie2012-08-211-0/+7
| | |
| * | Cause a persistence save if prim flags changeMelanie2012-08-211-0/+2
| | |
| * | Add Camera Offsets to serializationMelanie2012-08-211-0/+14
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-08-201-6/+2
|\ \ \ | |/ /
| * | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-08-203-1/+12
|\ \ \ | |/ /
| * | Make the console output from the reigon console hookableMelanie2012-08-182-0/+11
| | |
| * | Fix a typoMelanie2012-08-181-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-187-37/+47
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | integrating redundant code into operatorSignpostMarv2012-08-182-14/+7
| | |
| * | Rot2Quaternion is now redundantSignpostMarv2012-08-182-12/+11
| | |
| * | constructor means not having to manually refer to individual propertiesSignpostMarv2012-08-183-6/+6
| | |
| * | implicit operators mean one does not need to instantiate new objects manuallySignpostMarv2012-08-182-7/+5
| | |
| * | adding missing refactor for LSL_VectorSignpostMarv2012-08-181-1/+1
| | |
| * | Implementing operators & constructors for QuaternionSignpostMarv2012-08-181-0/+18
| | |
| * | Fix the whitespace formatting error introduced by the last patchMelanie2012-08-181-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-189-124/+119
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactoring for Vector3 operator & constructor tweaksSignpostMarv2012-08-189-125/+119
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-1814-343/+395
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1814-342/+395
| |\
| | * adding null return to fix buildingSignpostMarv2012-08-171-1/+1
| | |
| | * fixing bug that get/set the wrong property for prim types other than sphere ↵SignpostMarv2012-08-172-3/+6
| | | | | | | | | | | | & box
| | * implementedSignpostMarv2012-08-173-0/+64
| | |
| | * attempt to handle InvalidCastException in a manner similar to Second LifeSignpostMarv2012-08-172-2/+17
| | |
| | * BulletSim: Properly regenerate hulls when objects made physical.Robert Adams2012-08-172-17/+33
| | | | | | | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-176-278/+146
| | |\
| | | * BulletSim: restore most of the Detail logging statements. Will haveRobert Adams2012-08-174-40/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | no effect on non-logging running. Capture region name that is passed to the physics engine and use it for detail logging file name prefix. Fix problem with avatars dropping when flying across region boundries.
| | | * Modify order of code so SOP doesn't set the physics actor flyingRobert Adams2012-08-171-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change.