aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-291-2/+2
|\
| * Remove mono compiler warning. Adjust message log to error from infoJustin Clark-Casey (justincc)2012-04-281-2/+2
* | Merge branch 'master' into careminsterMelanie2012-04-274-11/+57
|\ \ | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-272-2/+2
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-264-21/+41
| |\
| * | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-262-9/+55
* | | Merge branch 'master' into careminsterMelanie2012-04-251-15/+24
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-253-6/+17
| |\ \
| * | | Add try/catch around Json script method registration to avoild some issuesMic Bowman2012-04-251-15/+24
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-04-251-1/+1
|\ \ \ | | |/ | |/|
| * | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-04-251-10/+2
|\ \ \ | |/ /
| * | Minor improvements to loggingOren Hurvitz2012-04-241-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-04-241-3/+14
|\ \ \ | |/ /
| * | Add online/offline indicator to "friends show" region console command.Justin Clark-Casey (justincc)2012-04-241-3/+14
| |/
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-201-1/+7
|\ \
| * | Allow scripts in attachments owned by the NPC to control the NPCMelanie2012-04-181-1/+7
* | | Merge branch 'master' into careminsterMelanie2012-04-184-1/+1421
|\ \ \ | |/ / |/| / | |/
| * clean up some more logging spam in the jsonstore modulesMic Bowman2012-04-172-2/+4
| * Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.Mic Bowman2012-04-173-5/+7
| * This commit adds a new optional region module, JsonStore, that provides struc...Mic Bowman2012-04-173-0/+1416
| * make the namespace for the ScriptModuleComms consistent with its file system ...Mic Bowman2012-04-171-1/+1
* | Merge branch 'master' into careminsterMelanie2012-04-071-1/+2
|\ \ | |/
| * Added missing refresh of group membership client side cache to the groups mod...Snoopy Pfeffer2012-04-051-1/+2
* | Merge branch 'master' into careminsterMelanie2012-03-312-1/+190
|\ \ | |/
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * minor: remove some now unneeded code from FriendsCommandsModuleJustin Clark-Casey (justincc)2012-03-301-55/+0
| * Make default "show friends" console command show friends fetched from the fri...Justin Clark-Casey (justincc)2012-03-301-4/+83
| * refactor: Move "friends show cache" console command out into separate Friends...Justin Clark-Casey (justincc)2012-03-301-0/+165
| * Add back parts of reverted changes that were not concerned with child agent c...Justin Clark-Casey (justincc)2012-03-292-3/+3
| * Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-292-3/+3
* | Merge branch 'master' into careminsterMelanie2012-03-292-3/+3
|\ \ | |/
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-282-3/+3
* | Merge branch 'master' into careminsterMelanie2012-03-281-46/+24
|\ \ | |/
| * minor: clean up some code formatting in VivoxVoiceModule.csJustin Clark-Casey (justincc)2012-03-271-54/+25
* | Merge branch 'master' into careminsterMelanie2012-03-271-25/+119
|\ \ | |/
| * Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user...Snoopy Pfeffer2012-03-271-23/+99
| * User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-271-2/+20
* | Merge branch 'master' into careminsterMelanie2012-03-261-4/+14
|\ \ | |/
| * Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-261-4/+14
* | Merge branch 'master' into careminsterMelanie2012-03-261-7/+18
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-261-1/+11
| |\
| | * Fix compile error in ScriptModuelComms and add some debugging into the modInvokeMic Bowman2012-03-251-2/+12
| * | Add a hust UUID to the script invocationsMelanie2012-03-261-7/+8
| |/
* | Fix TypoMelanie2012-03-261-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-261-1/+3
|\ \ | |/
| * Further simplify ScriptCommsMelanie2012-03-261-1/+3
| * Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+21
| * Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-14/+22
* | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+21