aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-262-1/+3
|\
| * minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to ↵Justin Clark-Casey (justincc)2013-01-261-0/+2
| | | | | | | | disable any enabled logging from previous tests
| * minor: remove mono compiler warning in SceneCommandsModuleJustin Clark-Casey (justincc)2013-01-251-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-01-191-15/+23
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * Fix use of scene debug commands when region is set to root or a specific ↵Justin Clark-Casey (justincc)2013-01-191-15/+12
| | | | | | | | region where there is more than one region on the simulator.
| * Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-181-0/+11
| | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
* | Merge branch 'master' into careminsterMelanie2013-01-111-0/+227
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Fix a regression in the last few scene commands changes where setting these ↵Justin Clark-Casey (justincc)2013-01-111-52/+2
| | | | | | | | | | | | | | via the viewer estate dialog stopped working. Forgot to register the new interface. Also removes some code which got included by adpating an existing module.
| * Add "debug scene get" console command to list current scene optionsJustin Clark-Casey (justincc)2013-01-101-2/+43
| |
| * Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-0/+236
| | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* | Merge branch 'avination' into careminsterMelanie2013-01-061-1/+1
|\ \
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+1
| | | | | | | | | | | | Cached Bakes.
* | | Merge branch 'master' into careminsterMelanie2013-01-041-6/+8
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | updating documentation in SampleMoneyModule based on doxygen error log ↵SignpostMarv2013-01-031-6/+8
| | | | | | | | | | | | output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+1
|\ \ \ | | |/ | |/|
| * | Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-031-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'avination' into careminsterMelanie2012-11-201-0/+6
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+6
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-152-22/+7
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-152-7/+22
| |\ \
* | \ \ Merge branch 'avination' into careminsterMelanie2012-11-171-1/+1
|\ \ \ \ | |/ / /
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-1/+1
| | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
* | | | Merge branch 'master' into careminsterMelanie2012-11-153-0/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | All optional modules' directives moved out of addin.xmlDiva Canto2012-11-133-0/+6
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-132-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-122-2/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-2/+1
| | | | | | | | | | | | | | | | grepping for remaining uses
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-46/+78
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | document & 80-character width terminal formattingSignpostMarv2012-11-111-49/+80
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
| * | | converting NPC module to ISharedRegionModuleSignpostMarv2012-11-111-9/+22
| | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | Merge branch 'master' into careminsterMelanie2012-11-111-11/+19
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | One more module converted: TreePopulator.Diva Canto2012-11-091-11/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-301-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-291-0/+11
| | | | | | | | | | | | | | | | | | This was because we were removing by circuitcode where NPCs have no code. Now removing by agent ID instead. This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
* | | Merge branch 'master' into careminsterMelanie2012-10-261-4/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-4/+6
| | | | | | | | | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
* | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-0/+4
| | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* | | Merge branch 'master' into careminsterMelanie2012-08-231-2/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-0/+5
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | Remove NPC debug spamMelanie2012-08-141-7/+7
| |
* | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-08-141-33/+29
|\ \ | | | | | | | | | avination
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-33/+29
| |\ \ | | |/
| | * Prevent race conditions when one thread removes an NPC SP before another ↵Justin Clark-Casey (justincc)2012-08-141-34/+30
| | | | | | | | | | | | thread has retreived it after checking whether the NPC exists.
* | | Removed more spammy NPC crapMelanie2012-08-141-1/+1
| | |
generated by cgit v1.1 at 2024-12-20 16:31:22 +0000