Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Comment out a terrain save-tile debugging message that accidentally crept in ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -6/+6 |
| | | | | with c4b2d24 | ||||
* | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+8 |
| | | | | MoveTaskInventoryItem() | ||||
* | Fix llGiveInventory() so that it checks the destination part for ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 2 | -6/+63 |
| | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -7/+10 |
|\ | |||||
| * | HG Friends: don't notify if the server isn't there. | Diva Canto | 2012-03-22 | 1 | -7/+10 |
| | | |||||
* | | Add llGiveInventory() test from object to object where both objects are ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 7 | -7/+146 |
|/ | | | | owned by the same user. | ||||
* | Change a false false to be truly true - or is this statement false? | Melanie | 2012-03-22 | 1 | -1/+1 |
| | | | | Fixes perms boo-boo | ||||
* | Rework Diva's patch to simplify it | Melanie | 2012-03-22 | 3 | -16/+30 |
| | |||||
* | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵ | Melanie | 2012-03-22 | 4 | -88/+6 |
| | | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9. | ||||
* | Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵ | Diva Canto | 2012-03-22 | 4 | -6/+88 |
| | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. | ||||
* | refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 4 | -9/+9 |
| | | | | clarity since non-default animations are handled completely separately from this class | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 12 | -64/+376 |
|\ | |||||
| * | Updated the UserAccountsClient a little bit, plus some more sanity checks on ↵ | Diva Canto | 2012-03-21 | 2 | -22/+53 |
| | | | | | | | | the service connector. | ||||
| * | HG Friends: reroute the status notifications to the HGFriends service, so ↵ | Diva Canto | 2012-03-21 | 9 | -8/+248 |
| | | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release. | ||||
| * | HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that ↵ | Diva Canto | 2012-03-21 | 3 | -20/+58 |
| | | | | | | | | we can better manage this traffic. | ||||
| * | Removed extraneous debug message | Diva Canto | 2012-03-21 | 1 | -1/+0 |
| | | |||||
| * | Removed extraneous debug message | Diva Canto | 2012-03-21 | 1 | -3/+0 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 5 | -60/+143 |
| |\ | |||||
| * | | Removed extraneous debug messages. Added a check for UUID.Zero. | Diva Canto | 2012-03-20 | 1 | -16/+23 |
| | | | |||||
* | | | Instead of loading default avatar animations in both SLUtil and ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 10 | -99/+85 |
| |/ |/| | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit"). | ||||
* | | If "debug scene updates true" then print out to log when a garbage ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 2 | -0/+65 |
| | | | | | | | | collection occurs. | ||||
* | | Add Scene.DebugUpdates switch which, if turned on, will print out a warning ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -10/+32 |
| | | | | | | | | | | | | | | when a frame updates takes longer than twice the desired time This is controlled via "debug scene updates true|false" on the region console. Also fix an oversight with "debug scene teleport true|false" | ||||
* | | Incorporate scene teleporting debugging into "debug scene teleport ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -18/+6 |
| | | | | | | | | true|false" command | ||||
* | | Replace "scene debug true false true" console command with "scene debug ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -37/+45 |
|/ | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings. | ||||
* | Refix the fixed fix! | Melanie | 2012-03-21 | 1 | -2037/+2037 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -1/+1 |
|\ | |||||
| * | fix compile error from last commit | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -1/+1 |
| | | |||||
* | | Fixed borkness with map search introduce by my last changes to it. | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -18/+7 |
|\ \ | |/ | |||||
| * | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest() | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -18/+7 |
| | | |||||
* | | Fixed borkness with previous merge. | Diva Canto | 2012-03-20 | 1 | -16/+1 |
| | | |||||
* | | Line endings | Diva Canto | 2012-03-20 | 1 | -89/+89 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 25 | -308/+509 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Util.cs | ||||
| * | Add ability to log warn if a frame takes longer than twice the expected ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -7/+14 |
| | | | | | | | | time. Currently commented out. | ||||
| * | Add prim name to "[MESH]: No recognized physics mesh..." log message | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| | | |||||
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -2/+0 |
| | | |||||
| * | remove unnecessary tmpFrameMS, use maintc instead for frame time calculation | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+2 |
| | | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| |\ | |||||
| | * | slight increase in jump power to make running jump slightly better. | nebadon | 2012-03-20 | 1 | -1/+1 |
| | | | |||||
| * | | Move frame loop entirely within Scene.Update() for better future performance ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 8 | -179/+213 |
| |/ | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame. | ||||
| * | reduce avatar verticle jump from the absurd 5 meter jump to a less | nebadon | 2012-03-20 | 1 | -1/+1 |
| | | | | | | | | | | absurd 3m vertical jump to better match what you would see in Second Life and be more in line with what users would expect. | ||||
| * | refactor: precalculate the fixed movement factor for avatar tilting ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -8/+16 |
| | | | | | | | | (sqrt(2)) rather than doing it multiple times on every move. | ||||
| * | refactor: Eliminate unnecessary duplicate avCapsuleTilted | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+7 |
| | | |||||
| * | Remove pointless ThreadAbortException catching in a test that isn't run anyway. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -11/+5 |
| | | |||||
| * | Remove some pointless catching/throwing in the scene loop. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -7/+0 |
| | | |||||
| * | Fix small typo | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| | | |||||
| * | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -10/+16 |
| | | | | | | | | | | | | the same time. Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time. | ||||
| * | Add some doc about the EventManager.OnLoginsEnabled event. | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -0/+7 |
| | | |||||
| * | Fix a bug where logins to standalones would fail if the RegionReady module ↵ | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -7/+2 |
| | | | | | | | | | | | | | | was not active Unfortunately, the OnLoginsEnabled event is currently only guaranteed to fire if the RegionReady module is active. However, we can instantiate the AuthorizationService in the module RegionLoaded method since by this time all other modules will have been loaded |