aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-1111-39/+117
|\ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669teravus2013-06-101-2/+4
| |
| * add a Normalize() method for LSL_Rotationdahlia2013-06-101-0/+25
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-06-104-34/+51
| |\
| | * BulletSim: add failure flag for meshing failure vs asset fetch failureRobert Adams2013-06-104-34/+51
| | | | | | | | | | | | | | | | | | so error messages make more sense. Change some BulletSim status log messages from WARN to INFO. Update TODO list.
| * | Fix test for adding temporary assets. Code for non-local temporary assetsMic Bowman2013-06-101-0/+20
| |/ | | | | | | is there but commented out.
| * Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-102-2/+2
| | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
| * Mantis 5346: llAxisAngle2Rot() should normalize before computingTalun2013-06-101-0/+1
| | | | | | | | | | | | | | | | Corrected to agree with http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes to normalise the vector before computing the quaternion Signed-off-by: dahlia <dahlia@nomail>
| * Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
| |
| * Merge branch 'profiles'BlueWall2013-06-072-0/+4
| |\ | | | | | | | | | message to explain why this merge is necessary,
| | * SQLite support for UserProfilesBlueWall2013-06-071-0/+1
| | |
| | * Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-082-1/+30
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-072-1/+30
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-074-6/+11
| | |\ \
| | | * | minor: Comment out debug logging (at warn level) about number of objects ↵Justin Clark-Casey (justincc)2013-06-071-1/+1
| | | |/ | | | | | | | | | | | | force selected and turn down to debug level
| | * | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29
| | | |
| * | | Supply proper type information for the various types of requestsMelanie2013-06-072-6/+7
| | | |
| * | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-073-8/+8
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-06-073-5/+6
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * | Fix regression where multiple close agents could be sent to the wrong ↵Justin Clark-Casey (justincc)2013-06-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-071-3/+26
| |\ \ | | |/
| * | In LocalFriendshipTerminated, send the original client's agentId to the ↵Donnie Roberts2013-06-072-4/+4
| | | | | | | | | | | | friend being removed instead of the friend's own id.
* | | Merge branch 'master' into careminsterMelanie2013-06-062-3/+31
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-061-0/+5
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0511-0/+229
| | |\
| | * | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
| | | |
| * | | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| | |/ | |/|
| * | Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-0611-0/+229
| |/ | | | | | | may yield unexpected results in some cases. No database persistence yet,
| * Committing Avination's Keyframe module. This is not hooked up yet and will ↵Melanie2013-06-061-0/+766
| | | | | | | | do nothing. More commits to follow.
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-06-052-63/+234
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-054-37/+84
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-051-14/+16
| | | |\
| | | * | Avoid a deadlock where a script can attempt to take a ↵Justin Clark-Casey (justincc)2013-06-051-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order. This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless). The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region. This looks to address http://opensimulator.org/mantis/view.php?id=6557
| | * | | Port Avination's inventory send throttlingMelanie2013-06-051-52/+213
| | | | |
* | | | | Merge branch 'avination-current' into careminsterMelanie2013-06-0624-49/+546
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | | | | Fix llTeleportAgentGlobalCoordsMelanie2013-06-021-11/+16
| | | | | |
| * | | | | Unsit seated avatars when an object is deletedMelanie2013-06-021-0/+8
| | | | | |
| * | | | | Implement PERMISSION_TELEPORT and the needed checks to make it work.Melanie2013-06-022-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | Old auth system still works as well.
| * | | | | Fix multi-wear of alpha and tattoo layers.Melanie2013-05-311-4/+4
| | | | | |
| * | | | | Stop sending velocity to avoid snap-backMelanie2013-05-311-1/+1
| | | | | |
| * | | | | Allow Linden trees to preserve their type when taken into inventory and ↵Melanie2013-05-263-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
| * | | | | Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-255-33/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
| * | | | | Reset "Show in search" on parcels cut off other parcels that are in searchMelanie2013-05-241-0/+2
| | | | | |
| * | | | | Port fix from justicc - decouple pay prices on drag-copied primsMelanie2013-05-241-0/+1
| | | | | |
| * | | | | Let the event queue do lees work - expire every 40s as per Teravus instead ↵Melanie2013-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | of every seconds - whoever put that in....
| * | | | | * This fixes the avatar stuck in objects on login and teleport by gently ↵teravus2013-05-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applying an upward motion when stuck in things on the Z * Comments describe how it filters out good, normal collisions, from 'stuck' collisions.. It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
| * | | | | * Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. ↵teravus2013-05-141-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection)
| * | | | | Explicitly zero avatar velocity on sitMelanie2013-05-131-0/+4
| | | | | |
| * | | | | Small adjustments to the floater moduleMelanie2013-05-132-2/+5
| | | | | |
generated by cgit v1.1 at 2024-09-12 23:13:48 +0000