aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-303-20/+46
|\
| * Patch in the rest of the maptile stuffMelanie2012-01-301-3/+7
| * Add the needed column in the regions table and a few tweaks.Melanie2012-01-301-0/+9
| * Next step for world map overlaysMelanie2012-01-302-3/+11
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-300-0/+0
| |\
| * | Some plumbing for map overlaysMelanie2012-01-301-15/+20
* | | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ...Justin Clark-Casey (justincc)2012-01-301-5/+7
| |/ |/|
* | Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"BlueWall2012-01-301-1/+1
|/
* Pickup map overlay tile from RegionSettings.ParcelImageIDBlueWall2012-01-301-1/+1
* Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-303-2/+18
* Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/...Garmin Kawaguichi2012-01-291-1/+1
* Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php...PixelTomsen2012-01-292-1/+72
* Merge branch 'master' of /home/opensim/var/repo/opensim into mapworkBlueWall2012-01-2811-40/+150
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-2811-40/+150
| |\
| | * 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
* | | | Adding our parcel's generated id to map packetsBlueWall2012-01-281-2/+2
|/ / /
* | | Send CHANGED_TELEPORT during local TP again - partially revert cf73afec356eed...Bo Iwu2012-01-281-2/+1
| |/ |/|
* | 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
* 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
|\
| * HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-261-0/+30
| |\
| | * Support rejecting a teleport if a user is banned in all parcels that haveMelanie2012-01-261-0/+30
| * | llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageE...PixelTomsen2012-01-265-0/+89
| |/
| * Change references from sop to sog and add protection from null refBlueWall2012-01-261-11/+13
* | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ...Justin Clark-Casey (justincc)2012-01-274-20/+56
|/
* Add basic TestAddScript() regression testJustin Clark-Casey (justincc)2012-01-262-0/+87
* Re-enable error logging associated with assembly and script loading failure i...Justin Clark-Casey (justincc)2012-01-261-9/+19
* 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
| * 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
| |/ /
* | | 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
|/ /
* | 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
|\ \ | |/