aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Make parcel sale overlays work. No auction support.Melanie2012-01-312-7/+87
|
* Comment debug spamMelanie2012-01-301-3/+3
|
* 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
| | | | | | | | | | | | | | | | SceneObjectGroupsByFullID is updated elsewhere at the same time.
| | * | Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"BlueWall2012-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00d1c88c59c10aa8d34fa36910cf0f1f0e9878b8. Need to dig a little deeper to see exactly how V1 viewers are using this
| * | | 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
| | | | | | | | | | | | | | | Warning: Contains a Migration Warning: Cannot guarantee nut free
| * | Next step for world map overlaysMelanie2012-01-302-3/+11
| | |
| * | 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
|\ \ | | | | | | | | | careminster
| * | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-283-1/+28
| | | | | | | | | | | | RemoteAdmin message
| * | 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
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * | Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-303-2/+18
| | | | | | | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | | Merge branch 'master' into careminsterMelanie2012-01-294-5/+75
|\ \ \ | |/ / | | / | |/ |/|
| * Fix llEdgeOfWorld functionality - see mantis ↵Garmin Kawaguichi2012-01-291-1/+1
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5865 Signed-off-by: nebadon <michael@osgrid.org>
| * Fix:Get embedded objects in notecard ↵PixelTomsen2012-01-291-0/+71
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org>
| * Merge branch 'master' of /home/opensim/var/repo/opensim into mapworkBlueWall2012-01-289-38/+148
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-289-38/+148
| | |\
| * | | Adding our parcel's generated id to map packetsBlueWall2012-01-281-2/+2
| |/ /
| * | Send CHANGED_TELEPORT during local TP again - partially revert ↵Bo Iwu2012-01-281-2/+1
| | | | | | | | | | | | | | | | | | cf73afec356eed30e169be3ce71edad89b4fdb37 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Make all NPCs owned by defaultMelanie2012-01-281-1/+1
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-289-27/+128
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-01-289-27/+128
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| | * | Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry ↵Justin Clark-Casey (justincc)2012-01-281-4/+12
| | | | | | | | | | | | | | | | texEntry) for region modules
| | * | Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-287-21/+116
| | | | | | | | | | | | | | | | same grid don't have the publisher as owner.
| | * | 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 ↵Justin Clark-Casey (justincc)2012-01-281-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spurious errors and "script saved" messages when script properties were changed. Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes. It's unknown whether the commented out code was working for very old viewers or not. Code is commented out to reduce complexity and so that useful error messages don't need to be removed. If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
* | | | 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
| |/ | | | | | | agent id anyway
| * Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().Justin Clark-Casey (justincc)2012-01-287-17/+83
| | | | | | | | | | This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension). Wiki doc on this and other recent NPC functions will follow soon
* | 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 ↵Justin Clark-Casey (justincc)2012-01-273-0/+29
| | | | | | | | belongs to an NPC in the region. FALSE if not or if the NPC module isn't present.
| * 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
| | | | | | | | | | | | | | | | | | | | | NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc. llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return. Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
* | | 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
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-261-0/+30
| |\ \
generated by cgit v1.1 at 2024-12-27 09:21:02 +0000