ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-05 11:37:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,650 Commits 5 Branches 82 Tags
d6b8febbf44e5aed73153129a4fa55c3fb10eee2
Commit Graph

797 Commits

Author SHA1 Message Date
Melanie
985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
BlueWall
6b867773a8 Remove some debugging output form the logger 2012-02-16 08:59:34 -05:00
Melanie
0c1074537b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-02-16 00:38:04 +00:00
Justin Clark-Casey (justincc)
c906128191 Fix some logic mistakes where firstly osNpcCreate() without options was creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect. 
Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
 2012-02-16 00:22:39 +00:00
Dan Lake
2ebb421331 Refactor appearance saving for NPC to use AvatarFactoryModule interface. 2012-02-14 17:20:34 -08:00
Melanie
272ba5a741 Merge branch 'master' into careminster 2012-02-15 01:11:17 +00:00
Mic Bowman
a9e8bd59a3 Fix a race condition in the simian groups connector. When requests were 
too slow they would circumvent the cache (piling up on the network service
and making the problem even worse). This condition happens frequently
during permission checks.
 2012-02-13 19:38:22 -08:00
PixelTomsen
4589ce61bc Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceModul 
http://opensimulator.org/mantis/view.php?id=2607
 2012-02-14 02:12:12 +00:00
Melanie
215acbcc96 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-02-10 10:20:51 +00:00
Justin Clark-Casey (justincc)
9c84a8162f If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead. 2012-02-09 01:17:59 +00:00
Melanie
7c888f6af1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-02-09 00:19:37 +00:00
Justin Clark-Casey (justincc)
dbe32a1f6d minor: put in commented out logging statements for future reuse 2012-02-09 00:10:45 +00:00
Melanie
9c6ba8d18f Push more NPC stuff into threads 2012-02-08 13:04:23 +01:00
Melanie
ce5e900721 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-02-04 11:48:20 +00:00
BlueWall
0742630d81 Merge branch 'master' of /home/opensim/src/opensim 2012-02-03 18:20:26 -05:00
Justin Clark-Casey (justincc)
ce34b359ad Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene presence and population of m_avatars. 
This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated.
Extending the lock is the easiest to understand solution rather than getting complicated with null checks.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
 2012-02-03 23:04:26 +00:00
PixelTomsen
5c545d1d2e Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-02-03 18:02:51 -05:00
Melanie
447a66d660 Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more 
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
 2012-02-02 23:40:56 +00:00
Melanie
07c487a28f Make ban, eject, freeze and the scripted versions of those work. 2012-02-02 21:36:45 +01:00
Melanie
428407c5e4 Merge branch 'master' into careminster 2012-01-28 01:01:23 +00:00
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
427ab55058 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 00:45:57 +00:00
Justin Clark-Casey (justincc)
7e76397a26 minor: correct text and usage for "image queues show" reigon console command. 2012-01-24 20:54:35 +00:00
Melanie
ba3b0c69f1 Merge branch 'master' into careminster 2012-01-21 19:52:33 +00:00
BlueWall
b6f3de5028 Telehub Support: 
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
 2012-01-20 23:50:37 -05:00
Justin Clark-Casey (justincc)
c92a9a6640 Add "image queues clear <first-name> <last-name>" console command 
This allows a way to manually clear pending image queue requests for debug purposes
 2012-01-19 19:49:06 +00:00
BlueWall
eea726d74e RegionReady: 
Back out some of the oar monitoring for the time being. Need to find  a better way to get feedback. Will re-visit this soon.
 2012-01-18 20:30:57 -05:00
Melanie
b14a6acd2f Merge branch 'master' into careminster 2012-01-16 23:08:47 +00:00
Mic Bowman
2e4fbe6b17 protect the region ready alerts for loading oarfiles if no post URI is set 2012-01-14 23:43:21 -08:00
Melanie
43128c9016 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-01-14 06:09:19 +00:00
BlueWall
57ba9ef5ad Update RegionReadyModule 
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
 2012-01-13 11:35:44 -05:00
Melanie
cf166d3f1e Merge branch 'master' into careminster 2012-01-12 23:22:55 +00:00
Justin Clark-Casey (justincc)
1ac5aa6808 Add remove test for unowned avatars 2012-01-12 20:47:19 +00:00
Justin Clark-Casey (justincc)
ba3491c76e Add permissions checks for owned avatars to all other osNpc* functions. 
This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
 2012-01-12 19:06:46 +00:00
Justin Clark-Casey (justincc)
b47c0d7e51 refactor: Move existing npc owner checks to NPCModule.CheckPermissions() methods and expose on interface for external calls. 2012-01-12 18:14:19 +00:00
Melanie
4492bc1bcd Merge branch 'master' into careminster 2012-01-12 17:52:29 +00:00
Justin Clark-Casey (justincc)
53fb20880c minor: Fix wrong column length in image queues report 2012-01-10 22:02:35 +00:00
Justin Clark-Casey (justincc)
5002f06d24 rename "show image queue" to "show image queues" in line with other udp info commands. 
Eliminate redundant one line methods
 2012-01-10 21:36:35 +00:00
Justin Clark-Casey (justincc)
ef074deb52 Add "show image queue <first-name> <last-name>" region console command 
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
 2012-01-10 21:30:12 +00:00
Melanie
8fa1108b72 Merge branch 'master' into careminster 2012-01-10 21:28:59 +00:00
Justin Clark-Casey (justincc)
d67e8291c8 Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a particular baked texture, if any. 
This is for debugging to relate texture console entries back to particular users on the simulator end.
 2012-01-10 18:41:07 +00:00
Melanie
1cc685e820 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-01-10 18:33:32 +00:00
Melanie
7518b075b7 Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results. 2012-01-06 22:35:06 +00:00
Melanie
f1846045a6 Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results. 2012-01-06 21:34:43 +01:00
Melanie
fdfc4ab2a8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
 2012-01-06 00:08:18 +00:00
Justin Clark-Casey (justincc)
b86e7715a8 Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure 2012-01-05 22:54:33 +00:00
Justin Clark-Casey (justincc)
5ea9740f1b Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset 
For debugging purposes.
 2012-01-05 22:40:49 +00:00
Justin Clark-Casey (justincc)
da0fc3c8f5 Make "show asset" command available simulator side. Actually make the service command be "show asset" instead of "show digest" this time. 
Last time I accidnetally just changed the usage message.
 2012-01-05 21:11:32 +00:00
Justin Clark-Casey (justincc)
7319ba62dd Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands. 
This stops them appearing twice when Hypergrid is enabled.
 2012-01-05 20:51:49 +00:00