Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Don't pass on ChaneWaterHeight event from EventManager is new water height ↵ | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | is less than 0 This is to stop bad values and subsequent viewer crashes. Thanks to Michelle Argus for this patch. | |||||
| * | | Comment out accidentally left in "Adding physics prim" log message | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -1/+1 | |
| | | | ||||||
| * | | Tunnel [GroupsModule] DebugEnabled setting down into ↵ | Justin Clark-Casey (justincc) | 2011-12-16 | 2 | -11/+10 | |
| |/ | | | | | | | XmlRpcGroupsServicesConnectorModule so that we can record cache misses | |||||
| * | Sends the consistent child agent position upon creation of the child agent ↵ | Diva Canto | 2011-12-16 | 1 | -1/+12 | |
| | | | | | | | | in other regions, as opposed to <128, 128, 70> | |||||
| * | No functional changes. Changed the prefix of that log message [CONNECTION ↵ | Diva Canto | 2011-12-16 | 2 | -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 Canto | 2011-12-16 | 3 | -1/+6 | |
| | | ||||||
| * | Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter ↵ | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -5/+0 | |
| | | | | | | | | constructor | |||||
| * | Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() ↵ | Justin Clark-Casey (justincc) | 2011-12-15 | 4 | -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/opensim | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -1/+1 | |
| |\ | ||||||
| | * | minor fix to MegaRegions, typo spotted by Ubit! | nebadon | 2011-12-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 3 | -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 debugging | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -1/+8 | |
| | | ||||||
* | | Make raycast more efficient by checking exclusion flags earlier | Melanie | 2011-12-17 | 1 | -15/+21 | |
| | | ||||||
* | | Fix hit testing link sets properly. Fix raycasting for LSL. | Melanie | 2011-12-17 | 4 | -104/+343 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 3 | -60/+22 | |
|\ \ | |/ | ||||||
| * | Simplify some manipulation of _taintedActors in OdeScene | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -13/+6 | |
| | | ||||||
| * | Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour ↵ | Justin Clark-Casey (justincc) | 2011-12-14 | 1 | -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' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-14 | 2 | -11/+5 | |
| |\ | ||||||
| * | | Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe | Justin Clark-Casey (justincc) | 2011-12-14 | 2 | -2/+2 | |
| | | | | | | | | | | | | Also fix usage message. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2011-12-14 | 5 | -17/+12 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Just adding a comment to SendFullUpdatToClient | Dan Lake | 2011-12-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | Reorder clearing of upate schedule on SOP to before sending updates. Fix ↵ | Dan Lake | 2011-12-13 | 1 | -11/+3 | |
| |/ | | | | | | | potential race condition. | |||||
| * | In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() ↵ | Justin Clark-Casey (justincc) | 2011-12-13 | 2 | -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.cs | Justin Clark-Casey (justincc) | 2011-12-12 | 1 | -2/+1 | |
| | | ||||||
* | | Spin off terrain save into a new thread and make it so that it uses the old | Melanie | 2011-12-13 | 1 | -29/+34 | |
| | | | | | | | | values for places where NaN are found. | |||||
* | | Comment debug spam | Melanie | 2011-12-13 | 1 | -1/+1 | |
| | | ||||||
* | | Prevent a nasty deadlock on teleport | Melanie | 2011-12-12 | 1 | -24/+22 | |
| | | ||||||
* | | Make m_attachments private | Melanie | 2011-12-12 | 1 | -1/+1 | |
| | | ||||||
* | | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 2 | -10/+14 | |
| | | ||||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-12 | 10 | -266/+184 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 10 | -266/+184 | |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 6 | -50/+57 | |
| | | | | | | | | | | | | IsColliding | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-12-12 | 3 | -191/+72 | |
| | |\ | ||||||
| | | * | Mantis 5816: osParseJSON Decoding Problems | nebadon | 2011-12-11 | 3 | -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! | |||||
| | * | | Added an option for extra settings within region ini file. Any non-hardcoded ↵ | Dan Lake | 2011-12-12 | 1 | -20/+55 | |
| | |/ | | | | | | | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo | |||||
* | | | Send changed animation event asynchronously | Melanie | 2011-12-12 | 1 | -14/+17 | |
|/ / | ||||||
* | | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 2 | -14/+7 | |
| | | ||||||
* | | Prevent spurious error message when client tries to move a null item | Melanie | 2011-12-10 | 2 | -119/+143 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 5 | -0/+18 | |
|\ \ | |/ | ||||||
| * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 5 | -0/+18 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 11 | -105/+58 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||||
| * | minor: remove a mono compiler warning | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 | |
| | | ||||||
| * | Print out one log message for every missing baked texture, rather than two. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -22/+4 | |
| | | ||||||
| * | minor: comment out "unpacked appearance" log mesasge for now | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 | |
| | | ||||||
| * | Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 | |
| | | ||||||
| * | Do some clean up Scene.cs log messages. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -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-09 | 7 | -57/+16 | |
| | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 6 | -16/+106 | |
|\ \ | |/ | ||||||
| * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 | |
| | | ||||||
| * | Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+5 | |
| | |