aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-228-12/+208
|\
| * Fix llGiveInventory() so that it checks the destination part for AllowInvento...Justin Clark-Casey (justincc)2012-03-222-6/+63
| * 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 owned...Justin Clark-Casey (justincc)2012-03-227-7/+146
* | | 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
* | Fix merge issue from coreMelanie2012-03-221-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-2230-252/+646
|\ \ | |/
| * Rework Diva's patch to simplify itMelanie2012-03-223-16/+30
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-224-88/+6
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-224-6/+88
| * refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity...Justin Clark-Casey (justincc)2012-03-224-9/+9
| * 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
| | * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-219-8/+248
| | * HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that w...Diva Canto2012-03-213-20/+58
| | * 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 AvatarAnimati...Justin Clark-Casey (justincc)2012-03-2110-99/+85
| | |/ | |/|
| * | If "debug scene updates true" then print out to log when a garbage collection...Justin Clark-Casey (justincc)2012-03-212-0/+65
| * | Add Scene.DebugUpdates switch which, if turned on, will print out a warning w...Justin Clark-Casey (justincc)2012-03-211-10/+32
| * | Incorporate scene teleporting debugging into "debug scene teleport true|false...Justin Clark-Casey (justincc)2012-03-213-18/+6
| * | Replace "scene debug true false true" console command with "scene debug scrip...Justin Clark-Casey (justincc)2012-03-213-37/+45
| |/
* | Revert "Stop messing order of updates, destroing the defined order of the sel...Melanie2012-03-211-8/+3
* | Stop messing order of updates, destroing the defined order of the selected pr...UbitUmarov2012-03-211-3/+8
* | minor cleanUbitUmarov2012-03-211-27/+24
* | fix a bad reset of shapetype on pbshape change, added missing checksculpload...UbitUmarov2012-03-211-7/+10
* | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ma...UbitUmarov2012-03-211-4/+9
* | 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
| |\ \ | | |/
| | * 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
| | |\ \ \
| | * | | | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-2013-2189/+2785
| | * | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-176-10/+136
| * | | | | 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
| |\ \ \
| * | | | 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-09 01:51:45 +0000