aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | Fix displaying landmark and search info properly with long namesMelanie2012-01-301-1/+4
* | | Merge branch 'master' into careminsterMelanie2012-01-301-5/+7
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-301-5/+7
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-303-20/+46
| | |\ \
| | * | | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ...Justin Clark-Casey (justincc)2012-01-301-5/+7
| * | | | Use the requested sim's map, not our ownMelanie2012-01-301-2/+2
| | |/ / | |/| |
* | | | Use the requested sim's map, not our ownMelanie2012-01-301-2/+2
* | | | Merge branch 'master' into careminsterMelanie2012-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
| |\ \ \ | | |/ /
| | * | Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"BlueWall2012-01-301-1/+1
| * | | Some plumbing for map overlaysMelanie2012-01-301-15/+20
| |/ /
| * | Pickup map overlay tile from RegionSettings.ParcelImageIDBlueWall2012-01-301-1/+1
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-01-305-10/+37
|\ \ \
| * | | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-283-1/+28
| * | | Fix calculating land prim count type width issueMelanie2012-01-281-8/+8
| * | | Prevent an overlong description from messing up a ParcelInfoReplyMelanie2012-01-281-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-01-303-2/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-303-2/+18
* | | | Merge branch 'master' into careminsterMelanie2012-01-295-6/+76
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | 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
| | |\ \
| * | | | 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
* | | | Make all NPCs owned by defaultMelanie2012-01-281-1/+1
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-2811-29/+130
|\ \ \ \
| * \ \ \ 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
* | | | | Fix build breakMelanie2012-01-281-1/+2
|/ / / /
* | | | 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
| |\ \ \