aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-244-11/+6
|\
| * Merge branch 'master' into careminsterMelanie2011-12-244-11/+6
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-238-37/+97
| | |\
| | | * remove the old region crossing handlerMic Bowman2011-12-231-10/+0
| | | |
| | * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
| | | |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-244-28/+83
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into careminsterMelanie2011-12-234-28/+83
| |\ \ \ | | | |/ | | |/|
| | * | Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a region that does not exist. This is particularly problematic for physical objects where the velocity continues to move them out of the region causing an infinite number of failed region crossings. The patch forces an object that fails a crossing to be non-physical and moves it back into the starting region.
| | * | fix the UsesPhysics flag to reference the physics flag rather than the ↵Mic Bowman2011-12-221-1/+1
| | | | | | | | | | | | | | | | temponrez flag
| | * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| | | | | | | | | | | | | | | | otakup0pe
| | * | Align default ODE_STEPSIZE with that already used through OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-12-221-2/+2
| | | |
* | | | Add setter for Acceleration on physics objects.Melanie2011-12-242-0/+2
| | | |
* | | | Fix camera orientation for sit targets to use the prim actually sat on.Melanie2011-12-241-1/+1
| | | | | | | | | | | | | | | | Now SL compatible.
* | | | Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.Melanie2011-12-241-0/+9
|/ / / | | | | | | | | | For SL compatibility only
* | | Merge branch 'master' into careminsterMelanie2011-12-225-8/+23
|\ \ \ | |/ /
| * | rename Scene.m_physicalPrim to PhysicalPrims since its public and access ↵Justin Clark-Casey (justincc)2011-12-222-3/+3
| | | | | | | | | | | | external as a property
| * | Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-222-4/+2
| | |
| * | Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-223-1/+18
| |/ | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain.
* | Merge branch 'master' into careminsterMelanie2011-12-221-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are ↵Diva Canto2011-12-221-39/+32
| | | | | | | | passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+1
|\ \ | |/
| * And a typo fixMelanie2011-12-221-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+6
|\ \ | |/
| * Add a few comments, correct a merge artefactMelanie2011-12-221-1/+6
| |
* | Merge branch 'master' into careminsterMelanie2011-12-220-0/+0
|\ \ | |/
| * Harmonizing SP with AvinationMelanie2011-12-221-41/+55
| |
* | Merge branch 'master' into careminsterMelanie2011-12-2213-152/+134
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fixing a bug introduced yesterday. This put the precondition test inside ↵Diva Canto2011-12-221-105/+109
| | | | | | | | CheckForBorderCrossing the right way.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-2112-39/+15
| |\
| | * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-2011-35/+14
| | |
| * | Moved an external test into the method that uses those preconditions.Diva Canto2011-12-211-19/+11
| | |
| * | HG: Verify that the user is localDiva Canto2011-12-211-0/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-204-9/+9
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * | Though the viewer warns about receiving this, not sending appears to break ↵Justin Clark-Casey (justincc)2011-12-201-4/+1
| |/ | | | | | | | | | | | | | | | | | | baked texture caching when crossing region boundaries. Needs further investigation. Revert "Stop sending the viewer its own AvatarAppearance packet." This reverts commit 92039f295d7fe66bf1a09b29483f9057e395839e.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-2023-283/+304
| |\
| * | Fixed bug of avie going under the terrain when crossing regions in certain ↵Diva Canto2011-12-201-2/+2
| | | | | | | | | | | | directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
| * | Changed the async approach on close child agents. This may improve crossings ↵Diva Canto2011-12-162-7/+7
| | | | | | | | | | | | a little bit.
| * | Commented a couple of verbose debug messages.Diva Canto2011-12-162-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-193-36/+44
|\ \ \ | | |/ | |/|
| * | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs ↵Justin Clark-Casey (justincc)2011-12-193-36/+44
| | | | | | | | | | | | as this is updating SOG/SOP.GroupID, which is arguably generic.
* | | Merge branch 'master' into careminsterMelanie2011-12-198-62/+108
|\ \ \ | |/ /
| * | Stop sending the viewer its own AvatarAppearance packet.Justin Clark-Casey (justincc)2011-12-191-1/+4
| | | | | | | | | | | | | | | The viewer warns in the log if it receives this. Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
| * | Stop unnecessarily sending the TextureEntry in client avatar updates.Justin Clark-Casey (justincc)2011-12-191-1/+7
| | | | | | | | | | | | | | | | | | As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead. Tested this back to viewer 1.23. Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free.
| * | Fix race condition where the appearance update timer could be stopped just ↵Justin Clark-Casey (justincc)2011-12-191-3/+6
| | | | | | | | | | | | | | | | | | after another thread had started it on QueueAppearanceSave() or *Send() However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-191-1/+1
| |\ \
| | * | addresses mantis #5827nebadon2011-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | RAdmin - admin_save_oar fails if noassets parameter missing thanks Michelle Argus
| * | | Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-197-56/+90
| |/ / | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | | Merge branch 'master' into careminsterMelanie2011-12-1825-293/+302
|\ \ \ | |/ /
| * | Provide user feedback on execution of "backup" region console commandJustin Clark-Casey (justincc)2011-12-171-1/+2
| | |
| * | Fix bug where objects couldn't be set back to the "none" group.Justin Clark-Casey (justincc)2011-12-171-8/+13
| | | | | | | | | | | | | | | | | | | | | This is handled by treating UUID.Zero as a special case. Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case. It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately. This is a further component of http://opensimulator.org/mantis/view.php?id=5588
generated by cgit v1.1 at 2024-12-22 17:47:39 +0000