aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Minor formatting cleanupMelanie2012-08-251-2/+2
* Merge commit '58714b0aca71ce026226c6f76753905' into careminsterMelanie2012-08-250-0/+0
|\
| * minor formattingSignpostMarv2012-08-251-2/+2
* | Merge commit '5203665bb2d68c6a4e0ea3180334b607db6ab1ce' into careminsterMelanie2012-08-250-0/+0
|\ \ | |/
| * refactoring to local variable for cleaner codeSignpostMarv2012-08-251-2/+5
* | refactoring to local variable for cleaner codeSignpostMarv2012-08-251-2/+5
* | Merge commit '2a2e120470ea530ea0a6f035c5cf28247f94532c' into careminsterMelanie2012-08-250-0/+0
|\ \ | |/
| * since we will be making the Get return type the remaining ruleset as with the...SignpostMarv2012-08-252-18/+22
* | since we will be making the Get return type the remaining ruleset as with the...Melanie2012-08-252-137/+139
* | Also move the other avatar based overload out of harms wayMelanie2012-08-251-261/+261
* | Temprary restructure to avoid conflictsMelanie2012-08-251-183/+183
* | Merge commit 'a8044999fb056de0a815093953f82b33d540dd6f' into careminsterMelanie2012-08-250-0/+0
|\ \ | |/
| * use SceneObjectPart instead of varSignpostMarv2012-08-251-3/+3
| * renaming to be similar to equivalent Set commandSignpostMarv2012-08-253-8/+8
* | use SceneObjectPart instead of varMelanie2012-08-251-10/+8
* | renaming to be similar to equivalent Set commandMelanie2012-08-254-11/+11
* | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-259-37/+66
|\ \ | |/
| * Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca...Justin Clark-Casey (justincc)2012-08-251-16/+49
| * Allow multiple calling card type inventory folders to be created.Justin Clark-Casey (justincc)2012-08-251-0/+1
| * minor: Fix bad log message for failure to create an inventory folderJustin Clark-Casey (justincc)2012-08-251-1/+1
| * Log initial script startup info notice when xengine actually starts to do thi...Justin Clark-Casey (justincc)2012-08-252-3/+5
| * Extend "Restarting scripts in attachments" debug log message to show actual n...Justin Clark-Casey (justincc)2012-08-241-1/+3
| * If a connecting scene presence is replacing an existing scene presence then b...Justin Clark-Casey (justincc)2012-08-241-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-241-15/+5
| |\
| | * stripping superfluous whitespaceSignpostMarv2012-08-241-3/+0
| | * immediately returning the string.Join operation instead of checking if the li...SignpostMarv2012-08-241-11/+5
| | * refactoring using List.ConvertAll<string>SignpostMarv2012-08-241-6/+5
| * | Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down i...Justin Clark-Casey (justincc)2012-08-241-1/+1
| |/
| * adding sqlite journal files to .gitignoreSignpostMarv2012-08-241-0/+1
* | Merge branch 'master' into careminsterMelanie2012-08-244-1/+21
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-243-3/+39
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-243-1/+80
| | |\
| | * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-243-3/+39
| * | | Revert "implementing function to allow scripts to self-replicate as if the ow...Justin Clark-Casey (justincc)2012-08-243-62/+0
| | |/ | |/|
| * | implementing function to allow scripts to self-replicate as if the owner dupl...SignpostMarv2012-08-243-0/+62
| * | Removed land checking as suggested by SignpostMarv.TBG Renfold2012-08-241-12/+2
| * | Adds osGetHealth.TBG Renfold2012-08-243-1/+28
| |/
* | Merge branch 'avination' into careminsterMelanie2012-08-243-3/+39
|\ \
| * | Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
* | | Merge branch 'master' into careminsterMelanie2012-08-242-2/+35
|\ \ \ | | |/ | |/|
| * | If a script state save fails for some reason on shutdown/region removal, get ...Justin Clark-Casey (justincc)2012-08-231-2/+25
| * | Add an [HGAssetService] section to SQLiteStandalone.ini with the same connect...Justin Clark-Casey (justincc)2012-08-231-0/+10
* | | Merge branch 'master' into careminsterMelanie2012-08-2326-115/+270
|\ \ \ | |/ /
| * | this should be an if-else block in case the non-phys min/max are smaller than...SignpostMarv2012-08-221-5/+7
| * | Lock disposal of separate gdi+ objects under different threads since this pre...Justin Clark-Casey (justincc)2012-08-221-26/+42
| * | BulletSim: update DLLs and SOs to eliminate terrain update crash which manife...Robert Adams2012-08-214-0/+0
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-210-0/+0
| |\ \
| | * | testing github bot take 2nebadon2012-08-201-1/+0
| | * | testing github commit botnebadon2012-08-201-0/+1
| * | | Fix bug in SoundModule.PlayAttachedSound() where every sound update to an ava...Justin Clark-Casey (justincc)2012-08-211-3/+5
| |/ /