cfe924e4a8
Merge branch 'master' into careminster
2012-01-30 21:40:50 +00:00
e1cad4c34f
Use the requested sim's map, not our own
2012-01-30 21:38:46 +00:00
9dbb58ee8b
Merge branch 'master' into careminster
2012-01-30 21:26:47 +00:00
53c3faac5d
Patch in the rest of the maptile stuff
2012-01-30 21:24:21 +00:00
c4cc626dff
Add the needed column in the regions table and a few tweaks.
...
Warning: Contains a Migration
Warning: Cannot guarantee nut free
2012-01-30 20:34:32 +00:00
bde2ff5e78
Next step for world map overlays
2012-01-30 20:11:47 +00:00
ea16c9f858
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2012-01-30 19:49:12 +00:00
df9c35bc0f
Some plumbing for map overlays
2012-01-30 19:46:55 +00:00
9d93c4808e
lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if SceneObjectGroupsByFullID is updated elsewhere at the same time.
2012-01-30 19:21:58 +00:00
54e6b2402c
Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"
...
This reverts commit 00d1c88c59
2012-01-30 12:39:08 -05:00
00d1c88c59
Pickup map overlay tile from RegionSettings.ParcelImageID
2012-01-30 11:49:22 -05:00
ad02e01e77
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-30 16:44:26 +00:00
1b600e7803
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-30 16:38:11 +00:00
3de534896e
Add ParcelImageID to RegionSettings so we can have that overlay.
...
Warning: Contains a Migration.
Warning: May contain nuts.
2012-01-30 16:22:21 +00:00
9a86a713d3
Merge branch 'master' into careminster
2012-01-29 22:50:59 +00:00
5e60afe5ed
Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/view.php?id=5865
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 14:41:47 -07:00
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 12:40:43 -07:00
7c824f02b4
Add the ability to abort a pending restart using the viewer UI or a
...
RemoteAdmin message
2012-01-28 22:19:10 +01:00
498fe1afe7
Fix calculating land prim count type width issue
2012-01-28 21:23:54 +01:00
dac826da4e
Prevent an overlong description from messing up a ParcelInfoReply
2012-01-28 20:38:50 +01:00
f7c237c0e1
Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork
2012-01-28 11:35:28 -05:00
ae057a7589
Adding our parcel's generated id to map packets
2012-01-28 10:36:39 -05:00
1a20b60d82
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 08:47:25 -05:00
2e31f12cf4
Send CHANGED_TELEPORT during local TP again - partially revert cf73afec35
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-28 08:43:58 -05:00
2ef9fd05fa
Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry texEntry) for region modules
2012-01-28 02:45:13 +00:00
6fbc48ee9c
Make all NPCs owned by default
2012-01-28 03:32:25 +01:00
6db9109b3f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-28 03:22:36 +01:00
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
154ba0124a
Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner.
2012-01-28 02:21:41 +00:00
fbe324cc5e
Fix build break
2012-01-28 03:15:17 +01:00
090164ff7a
Completely disable NPC being sensed as agents, the abuse potential is too great
2012-01-28 03:12:56 +01:00
428407c5e4
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
088f1213b4
Remove accidental /user postfix from HomeURI in [HGInventoryAccessModule] in GridCommon.ini.example and from SRV_ProfileServerURI in [LoginService] in Robust.HG.ini.example
...
As per http://opensimulator.org/mantis/view.php?id=5852 , confirmed by diva via aiaustin
2012-01-28 01:01:19 +00:00
e391d6390c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 00:44:11 +00:00
deeb7287a2
Comment out xfer section in Scene.UpdateTaskInventory() which was causing 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.
2012-01-28 00:39:53 +00:00
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
7837c611fb
Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().
...
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
2012-01-28 00:00:12 +00:00
26a4e8a161
Merge branch 'master' into careminster
2012-01-27 23:30:26 +00:00
31b87ff07b
Increment LPS script stat for OSSL functions that were not already doing this
2012-01-27 23:24:49 +00:00
7c1d075a5a
Implement osIsNpc(key npc):integer. This return TRUE if the given key belongs to an NPC in the region. FALSE if not or if the NPC module isn't present.
2012-01-27 23:17:13 +00:00
abf0dd4250
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-27 23:14:34 +00:00
9939f94f08
Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' 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.
2012-01-27 23:05:48 +00:00
86b9e6fbed
Merge branch 'master' into careminster
2012-01-27 19:47:24 +00:00
91ac21b9ec
HG Inventoty: Guard against items not found.
2012-01-26 17:00:58 -08:00
9d60b84f78
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/EstateSettings.cs
2012-01-26 23:07:31 +00:00
6da82d9805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-26 16:29:39 -05:00
616373db16
llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageEstateAccess
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-26 16:15:23 -05:00
7229f6e64b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-01-26 10:32:22 +00:00
da720ce9be
Support rejecting a teleport if a user is banned in all parcels that have
...
spawn points
2012-01-26 10:21:45 +00:00
a537f7e1a3
Merge branch 'master' into careminster
2012-01-26 09:10:46 +00:00
Melanie