| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | 8 | -23/+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. | ||||
| | * | Get rid of the 'lolcat' library asset. | Justin Clark-Casey (justincc) | 2011-12-12 | 2 | -6/+0 |
| | | | | | | | | | This was both unused and an invalid jpeg2000 texture from way back in 2008 | ||||
| | * | minor: remove pointless comment from OdeScene.cs | Justin Clark-Casey (justincc) | 2011-12-12 | 1 | -2/+1 |
| | | | |||||
| | * | Remove long unused libdb_dotNET43.dll | Justin Clark-Casey (justincc) | 2011-12-12 | 1 | -0/+0 |
| | | | |||||
| * | | 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 |
| | | | |||||
| | * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -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-09 | 3 | -4/+95 |
| | | | | | | | | | 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 resizers | Melanie | 2011-12-09 | 1 | -5/+2 |
| | | | | | | | | | work again. | ||||
| * | | Set adaptive throttles false by default because it doesn't play nice with AVN | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | | | | | | | code | ||||
| * | | Fix llGetLinkKey to report avatars properly | Melanie | 2011-12-09 | 1 | -19/+0 |
| | | | |||||
| * | | Reverse the last one | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Dummy commit | Melanie | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'careminster' into bigmerge | Melanie | 2011-12-09 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | Fix the XMREngine not starting scripts on region startup. Turns out it | Melanie Thielker | 2010-07-25 | 1 | -5/+0 |
| | | | | | | | | | | | | | was a dumb merge artefact that caused it. | ||||
| | * | | Fix the XmlRpcRouterModule so it reads from the correct config section ↵ | Tom Grimshaw | 2010-07-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default) | ||||
| | * | | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the ↵ | Tom Grimshaw | 2010-07-24 | 1 | -2/+10 |
| | | | | | | | | | | | | | xmlrpc_uri event if it's not mentioned in the ini. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |