aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-2811-29/+130
|\
| * Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t...Justin Clark-Casey (justincc)2012-01-281-4/+12
| * Add experimental --publish option to "save oar" so that OARs reloaded to the ...Justin Clark-Casey (justincc)2012-01-287-21/+116
| * Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in ...Justin Clark-Casey (justincc)2012-01-282-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-286-10/+10
| |\
| * | Comment out xfer section in Scene.UpdateTaskInventory() which was causing spu...Justin Clark-Casey (justincc)2012-01-281-13/+20
* | | Completely disable NPC being sensed as agents, the abuse potential is too greatMelanie2012-01-282-5/+10
* | | Merge branch 'master' into careminsterMelanie2012-01-2813-27/+93
|\ \ \ | | |/ | |/|
| * | Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-286-10/+10
| |/
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-287-17/+83
* | Merge branch 'master' into careminsterMelanie2012-01-274-22/+126
|\ \ | |/
| * Increment LPS script stat for OSSL functions that were not already doing thisJustin Clark-Casey (justincc)2012-01-271-2/+41
| * Implement osIsNpc(key npc):integer. This return TRUE if the given key belong...Justin Clark-Casey (justincc)2012-01-273-0/+29
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-278-17/+139
| |\
| * | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ...Justin Clark-Casey (justincc)2012-01-274-20/+56
* | | Merge branch 'master' into careminsterMelanie2012-01-271-6/+7
|\ \ \ | | |/ | |/|
| * | HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
* | | Merge branch 'master' into careminsterMelanie2012-01-265-0/+89
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-261-0/+30
| |\ \
| * | | llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageE...PixelTomsen2012-01-265-0/+89
* | | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+27
|\ \ \ \ | | |/ / | |/| |
| * | | Support rejecting a teleport if a user is banned in all parcels that haveMelanie2012-01-261-0/+30
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-01-263-11/+100
|\ \ \ | |/ /
| * | Change references from sop to sog and add protection from null refBlueWall2012-01-261-11/+13
| |/
| * Add basic TestAddScript() regression testJustin Clark-Casey (justincc)2012-01-262-0/+87
* | Merge branch 'master' into careminsterMelanie2012-01-261-8/+17
|\ \ | |/
| * Re-enable error logging associated with assembly and script loading failure i...Justin Clark-Casey (justincc)2012-01-261-9/+19
* | Merge branch 'master' into careminsterMelanie2012-01-2620-113/+222
|\ \ | |/
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento...Justin Clark-Casey (justincc)2012-01-263-37/+40
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-259-12/+38
| |\
| | * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-252-4/+4
| | * Update BulletSim.dll with some interface changes and tuning (see opensim-libs...Robert Adams2012-01-257-8/+34
| * | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), R...Justin Clark-Casey (justincc)2012-01-252-80/+97
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-257-22/+100
| |\
| | * llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParce...Pixel Tomsen2012-01-255-1/+34
| * | minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates...Justin Clark-Casey (justincc)2012-01-251-3/+3
| * | Serialize calls to ODE Collide() function across OdeScene instances to preven...Justin Clark-Casey (justincc)2012-01-252-1/+32
* | | Typo fixMelanie2012-01-251-1/+1
* | | Spin off starting scripts in rezzed objects into a thread to avoid a recursionMelanie2012-01-251-1/+4
* | | Merge branch 'master' into careminsterMelanie2012-01-252-21/+66
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-252-8/+51
| |\ \
| | * \ Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-3/+51
| | |\ \
| | | * | Telehub map items displayedBlueWall2012-01-241-3/+51
| | * | | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreate...Dan Lake2012-01-241-6/+0
| | | |/ | | |/|
| * | | Change the WorldMapModule to use SOG rather than SOP for the telehub ansMelanie2012-01-251-13/+15
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-01-2510-169/+185
|\ \ \ | |/ /
| * | Make errors reported by OpenSim when it halts because it can't find certain c...Justin Clark-Casey (justincc)2012-01-243-20/+12
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-241-0/+18
| |\ \ | | |/
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-241-0/+18
| | |\
| | | * Put Telehubs on the mapBlueWall2012-01-241-0/+18