aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-228-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-222-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/opensimJustin Clark-Casey (justincc)2012-03-221-7/+10
| |\
| * | Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-227-7/+146
| | | | | | | | | | | | owned by the same user.
* | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-221-7/+10
|\ \ \ | | |/ | |/|
| * | HG Friends: don't notify if the server isn't there.Diva Canto2012-03-221-7/+10
| |/
| * Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
| | | | | | | | Fixes perms boo-boo
* | Fix merge issue from coreMelanie2012-03-221-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-2230-252/+646
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Rework Diva's patch to simplify itMelanie2012-03-223-16/+30
| |
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵Melanie2012-03-224-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 Canto2012-03-224-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-224-9/+9
| | | | | | | | clarity since non-default animations are handled completely separately from this class
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-2212-64/+376
| |\
| | * Updated the UserAccountsClient a little bit, plus some more sanity checks on ↵Diva Canto2012-03-212-22/+53
| | | | | | | | | | | | the service connector.
| | * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-219-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 Canto2012-03-213-20/+58
| | | | | | | | | | | | we can better manage this traffic.
| | * Removed extraneous debug messageDiva Canto2012-03-211-1/+0
| | |
| | * Removed extraneous debug messageDiva Canto2012-03-211-3/+0
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-205-60/+143
| | |\
| | * | Removed extraneous debug messages. Added a check for UUID.Zero.Diva Canto2012-03-201-16/+23
| | | |
| * | | Instead of loading default avatar animations in both SLUtil and ↵Justin Clark-Casey (justincc)2012-03-2110-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-212-0/+65
| | | | | | | | | | | | collection occurs.
| * | Add Scene.DebugUpdates switch which, if turned on, will print out a warning ↵Justin Clark-Casey (justincc)2012-03-211-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-213-18/+6
| | | | | | | | | | | | true|false" command
| * | Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-213-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.
* | Revert "Stop messing order of updates, destroing the defined order of the ↵Melanie2012-03-211-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.
* | Stop messing order of updates, destroing the defined order of the selected ↵UbitUmarov2012-03-211-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 cleanUbitUmarov2012-03-211-27/+24
| |
* | fix a bad reset of shapetype on pbshape change, added missing ↵UbitUmarov2012-03-211-7/+10
| | | | | | | | checksculpload ( to reload mesh on change )
* | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ↵UbitUmarov2012-03-211-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'UbitUmarov2012-03-212-34/+46
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2118-324/+1042
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-2116-296/+1018
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| | * Refix the fixed fix!Melanie2012-03-211-2037/+2037
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+1
| | |\
| | * | Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-18/+7
| | |\ \
| | * | | Fixed borkness with previous merge.Diva Canto2012-03-201-16/+1
| | | | |
| | * | | Line endingsDiva Canto2012-03-201-89/+89
| | | | |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2025-308/+509
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| | * | | | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-2013-2189/+2785
| | | | | | | | | | | | | | | | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
| | * | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-176-10/+136
| | | | | | | | | | | | | | | | | | | | | | | | direct user connections.
| * | | | | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | fix compile error from last commitJustin Clark-Casey (justincc)2012-03-211-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into careminsterMelanie2012-03-211-18/+7
| |\ \ \ \ | | |/ / /
| | * | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()Justin Clark-Casey (justincc)2012-03-211-18/+7
| | | |/ | | |/|
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-215-129/+311
| |\ \ \ | | | | | | | | | | | | | | | careminster
| * | | | Move the health monitoring stuff where it will do some goodMelanie2012-03-211-3/+3
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-03-201-7/+14
| |\ \ \ \ | | | |/ / | | |/| |
generated by cgit v1.1 at 2024-11-08 08:59:08 +0000