aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Sends the consistent child agent position upon creation of the child agent ↵Diva Canto2011-12-161-1/+12
| | | | | | | | in other regions, as opposed to <128, 128, 70>
| * No functional changes. Changed the prefix of that log message [CONNECTION ↵Diva Canto2011-12-162-15/+15
| | | | | | | | | | | | BEGIN] to [SCENE] because that's where the message happens. Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-1/+4
| |
| * Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter ↵Justin Clark-Casey (justincc)2011-12-151-5/+0
| | | | | | | | constructor
| * Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() ↵Justin Clark-Casey (justincc)2011-12-154-24/+27
| | | | | | | | | | | | when we've already passed size information to the avatar at PhysicsScene.AddAvatar() Eliminate some copypasta for height setting in OdeCharacter
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-151-1/+1
| |\
| | * minor fix to MegaRegions, typo spotted by Ubit!nebadon2011-12-151-1/+1
| | |
| * | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacterJustin Clark-Casey (justincc)2011-12-153-35/+56
| |/ | | | | | | | | | | Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly. Add commented out log lines for future use. Use automatic property for PhysicsActor for better code readability and simplicity
| * minor: add some currently commented log lines for use in debuggingJustin Clark-Casey (justincc)2011-12-141-1/+8
| |
* | Make raycast more efficient by checking exclusion flags earlierMelanie2011-12-171-15/+21
| |
* | Fix hit testing link sets properly. Fix raycasting for LSL.Melanie2011-12-174-104/+343
| |
* | Merge branch 'master' into careminsterMelanie2011-12-141-58/+20
|\ \ | |/
| * Simplify some manipulation of _taintedActors in OdeSceneJustin Clark-Casey (justincc)2011-12-141-13/+6
| |
| * Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ↵Justin Clark-Casey (justincc)2011-12-141-45/+14
| | | | | | | | | | | | of just a _taintedPrims HashSet. There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
* | Merge branch 'master' into careminsterMelanie2011-12-145-17/+12
|\ \ | |/
| * Just adding a comment to SendFullUpdatToClientDan Lake2011-12-131-0/+2
| |
| * Reorder clearing of upate schedule on SOP to before sending updates. Fix ↵Dan Lake2011-12-131-11/+3
| | | | | | | | potential race condition.
| * In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵Justin Clark-Casey (justincc)2011-12-132-4/+6
| | | | | | | | | | | | | | | | in the same thread rather than on another one. The caller is already an async thread from LLClientView so this doesn't hold up the client. However, launching on a separate thread does remove the effect of m_setAppearanceLock This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
| * minor: remove pointless comment from OdeScene.csJustin Clark-Casey (justincc)2011-12-121-2/+1
| |
* | Comment debug spamMelanie2011-12-131-1/+1
| |
* | Prevent a nasty deadlock on teleportMelanie2011-12-121-24/+22
| |
* | Make m_attachments privateMelanie2011-12-121-1/+1
| |
* | Remove spammy log messages when querying sim healthMelanie2011-12-121-2/+14
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-129-242/+129
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-129-242/+129
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵Dan Lake2011-12-126-50/+57
| | | | | | | | | | | | IsColliding
| | * Mantis 5816: osParseJSON Decoding Problemsnebadon2011-12-113-191/+72
| | | | | | | | | | | | | | | | | | | | | osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe!
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-102-14/+7
| |
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-102-119/+143
| |
* | Merge branch 'master' into careminsterMelanie2011-12-103-0/+14
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-103-0/+14
| |
* | Merge branch 'master' into careminsterMelanie2011-12-107-90/+49
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * minor: remove a mono compiler warningJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Print out one log message for every missing baked texture, rather than two.Justin Clark-Casey (justincc)2011-12-091-22/+4
| |
| * Do some clean up Scene.cs log messages.Justin Clark-Casey (justincc)2011-12-091-24/+38
| | | | | | | | | | This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows. This also uses m_log.*Format() which is more efficient than string concat.
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-095-44/+9
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into careminsterMelanie2011-12-094-12/+13
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| |
| * Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.Justin Clark-Casey (justincc)2011-12-091-4/+5
| |
| * Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵Justin Clark-Casey (justincc)2011-12-091-4/+6
| | | | | | | | | | | | it doesn't trigger an exception if the item hasn't been found. In this situation we will now put out a slightly more meaningful log error message instead.
| * Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-091-0/+2
| | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
* | Restore the Avination way of position and angle calculation so resizersMelanie2011-12-091-5/+2
| | | | | | | | work again.
* | Fix llGetLinkKey to report avatars properlyMelanie2011-12-091-19/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-097-255/+284
|\ \ | |/
| * Don't reply with an ack packet if the client is not authorized.Justin Clark-Casey (justincc)2011-12-082-45/+31
| |
| * Extend TestAddClient() to check that the first packet received is an ack packetJustin Clark-Casey (justincc)2011-12-083-93/+116
| |
| * Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suiteJustin Clark-Casey (justincc)2011-12-081-1/+1
| |
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-083-109/+138
| | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-083-16/+9
| | | | | | | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract