| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-23 | 42 | -269/+883 |
| |\ | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 0 | -0/+0 |
| | |\ | |||||
| | | * | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+8 |
| | | | | | | | | | | | | | MoveTaskInventoryItem() | ||||
| | * | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 8 | -12/+208 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | | * | 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 |
| | | |\ | |||||
| | | * | | 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. | ||||
| | * | | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster | Melanie | 2012-03-22 | 3 | -7/+27 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | HG Friends: don't notify if the server isn't there. | Diva Canto | 2012-03-22 | 1 | -7/+10 |
| | | |/ | |||||
| | | * | Added new simple_build_permissions config to the .ini and .example files. | Diva Canto | 2012-03-22 | 2 | -0/+17 |
| | | | | |||||
| | * | | Fix merge issue from core | Melanie | 2012-03-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 0 | -0/+0 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs | ||||
| | | * | Change a false false to be truly true - or is this statement false? | Melanie | 2012-03-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | Fixes perms boo-boo | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 32 | -256/+654 |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | 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 | 6 | -103/+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 | 6 | -6/+103 |
| | | | | | | | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-03-21 | 10 | -99/+85 |
| | | | |\ | |||||
| | | | * | | Fix typo | BlueWall | 2012-03-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Add enclosing " to urls | ||||
| | | * | | | 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 | 13 | -66/+382 |
| | | |\ \ | | | |/ | |||||
| | | | * | 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 |
| | | | |\ | |||||
| | | | * | | HG Friends config for Robust.HG.ini.example | Diva Canto | 2012-03-20 | 1 | -2/+6 |
| | | | | | | |||||
| | | | * | | 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. | ||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-22 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Framework/PriorityQueue.cs | ||||
| | * | | Revert "Stop messing order of updates, destroing the defined order of the ↵ | Melanie | 2012-03-21 | 1 | -8/+3 |
| | | | | | | | | | | | | | | | | | | | selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out." This reverts commit 68981d01f024f8a46949127e1cc23c81282f5220. | ||||
| * | | | reverted priorityQueue changes | UbitUmarov | 2012-03-21 | 1 | -8/+3 |
| |/ / | |||||
| * | | Stop messing order of updates, destroing the defined order of the selected ↵ | UbitUmarov | 2012-03-21 | 1 | -3/+8 |
| | | | | | | | | | priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out. | ||||
| * | | minor clean | UbitUmarov | 2012-03-21 | 1 | -27/+24 |
| | | | |||||
| * | | fix a bad reset of shapetype on pbshape change, added missing ↵ | UbitUmarov | 2012-03-21 | 1 | -7/+10 |
| | | | | | | | | | checksculpload ( to reload mesh on change ) | ||||
| * | | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ↵ | UbitUmarov | 2012-03-21 | 1 | -4/+9 |
| | | | | | | | | | may colide with how meshs and sculpts are loaded. This needs a good revision.. | ||||
| * | | shapetype support on chOde so it can also request a simple convex hull 'mesh' | UbitUmarov | 2012-03-21 | 2 | -34/+46 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-21 | 19 | -325/+1047 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 17 | -297/+1023 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | | * | 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 |
| | | |\ | |||||
| | | * | | 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 |
| | | |\ \ | |||||
| | | * | | | Fixed borkness with previous merge. | Diva Canto | 2012-03-20 | 1 | -16/+1 |
| | | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |