ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-30 02:57:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,681 Commits 5 Branches 83 Tags
d3892bbd0674e4f6912ce89e54712ea405dbbfb8
Commit Graph

630 Commits

Author SHA1 Message Date
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
Melanie
e497cf6f04 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-01-31 20:16:45 +00:00
Dan Lake
17440d8a29 Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed. 2013-01-31 11:14:43 -08:00
Oren Hurvitz
23f0610f0c Disabled DAExampleModule 2013-01-25 04:03:28 +00:00
Oren Hurvitz
8b4441d940 Changed DAMap to be the container of "data stores", which are OSDMaps. Store names must have at least 4 characters. 2013-01-25 04:03:18 +00:00
Justin Clark-Casey (justincc)
a6d9c26365 Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it 
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
 2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc)
d3095e2649 Add DAExampleModule to demonstrate dynamic attributes 
This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code.
Every time the object is moved, the move record is updated and the users in the scene alerted
The number of moves is persisted over server restarts in sqlite
 2013-01-25 04:03:07 +00:00
Melanie
fc1c77b42d Merge branch 'avination' into careminster 2013-01-23 19:31:27 +00:00
Melanie
997d53e532 EXPERIMENTAL - Comment out the check for the agent already being in transit 
to prevent avatars being locked into their sim on a failed teleport.
May have side effects and must be revisited to fix right.
 2013-01-23 18:17:49 +01:00
Melanie
0e17887e03 Allow TeleportCancel packets to reset the transfer state machine 2013-01-21 01:46:40 +01:00
Melanie
206bfe0657 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
 2013-01-16 17:05:37 +00:00
Diva Canto
37fcf87946 Changed a couple of debug messages at the request of osgrid. 2013-01-16 08:20:32 -08:00
Melanie
0a876a305c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
 2012-12-16 21:19:30 +00:00
Diva Canto
af8d53657d HGAssetMapper: Get wasn't really working. It's true that some assets are copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids. 2012-12-09 22:05:12 -08:00
Diva Canto
cb80d8a29c UserManagementModule: search the local cache for names too. 
Inventory transfers: don't do async on asset transfers or now.
 2012-12-09 15:31:11 -08:00
Melanie
2cb824d3fc Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-12-07 03:49:04 +00:00
Justin Clark-Casey (justincc)
e60fe958df minor: Fix more compiler warnings in CoreModules tests by properly overriding OpenSimTestCase.SetUp() 2012-12-05 23:44:12 +00:00
Melanie
fd7a83f439 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
 2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc)
22d4c52ffc Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests 2012-11-24 03:15:24 +00:00
Melanie
556d70feef Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2012-11-13 17:37:39 +00:00
Diva Canto
608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie
29bfd9e46c Merge branch 'master' into careminster 2012-11-13 02:28:40 +00:00
Diva Canto
48577af325 More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml. 2012-11-12 18:23:20 -08:00
Melanie
9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Diva Canto
152d5dc2a7 Fix mantis #6425 2012-11-11 21:13:14 -08:00
Melanie
389077345f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
 2012-11-11 16:31:01 +00:00
Diva Canto
f85d054bc6 One more module converted: MonitorModule. 2012-11-11 07:46:12 -08:00
Melanie
d0473b73da Merge branch 'master' into careminster 2012-11-03 15:38:47 +00:00
Diva Canto
7412795a0b HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE. 2012-11-02 08:05:56 -07:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc)
2fb89b5aac Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers. 
This is a very old method (+4 years) so is probably confusing code cruft.
 2012-10-26 01:15:16 +01:00
Melanie
fa52effb27 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
 2012-10-16 04:30:01 +01:00
Justin Clark-Casey (justincc)
d469bde849 minor: Add/correct some doc messages associated with entity teleport. 
I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication
At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context -
viewer still requests it though possibly only after TeleportFinish().  However, we will continue to send it.
 2012-10-16 01:20:41 +01:00
Melanie
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
73c9abf5f2 Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. 2012-10-09 01:35:27 +01:00
Melanie
f7df68d922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
 2012-10-07 02:48:28 +01:00
Justin Clark-Casey (justincc)
16c9c1dff7 On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates. 
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>".  Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
 2012-10-06 02:34:49 +01:00
Justin Clark-Casey (justincc)
d87813a194 Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP. 
This time I actually properly did a clean build
 2012-10-05 02:02:19 +01:00
Melanie
637e9a10db Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2012-10-04 20:16:23 +01:00
Justin Clark-Casey (justincc)
aa52c8b20f Output monitor data in response to console command on MainConsole.Instance rather than m_log 
This should really be happening for all console commands (though many don't).
However, things might get difficult if both a console command and other code invoke the same paths.
 2012-10-04 02:17:57 +01:00
Melanie
23d5bafa7f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
 2012-10-03 00:24:33 +01:00
Robert Adams
1e5869dcf6 Add Flush() method to LogWriter. Also correct line endings to Linux form. 2012-10-02 11:13:45 -07:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +01:00
Melanie
637f5440fe Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster 2012-09-27 15:46:35 +01:00
Melanie
daf84d7385 Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminster 2012-09-27 12:39:24 +01:00
Diva Canto
3c77b8f463 Use GridUser properly for foreign users. 2012-09-26 12:40:41 -07:00
Diva Canto
80133f9ebe Show the user's home url too on the console command. 2012-09-26 11:27:31 -07:00
Diva Canto
2f61763923 Not really a change, just added a reminder to fix something here. 2012-09-26 11:26:51 -07:00