ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,798 Commits 5 Branches 95 Tags
dotnet6
Commit Graph

404 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +01:00
Melanie
cdaceea5a6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-05-08 21:51:48 +01:00
Mic Bowman
33aaa40bee Adds an event and a method so that handling of the CachedTexture 
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
 2013-05-08 13:13:51 -07:00
Melanie
293a024c14 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:39:08 +01:00
Melanie
6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie
7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
Melanie
e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Justin Clark-Casey (justincc)
d6d6618f62 minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable any enabled logging from previous tests 2013-01-26 00:28:45 +00:00
Melanie
083ac92b34 Merge branch 'avination' into careminster 2013-01-06 10:52:22 +00:00
teravus
77cc7ce399 * Partial Commit for Avatar Appearance to include the functionality of Cached Bakes. 2012-12-21 19:12:30 -05: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
decc5318a7 Merge branch 'avination' into careminster 2012-11-20 01:21:15 +00:00
teravus
5e0294815f * Plumbing and basic setting of the GetMesh Cap Throttler. 
* Last step is to flip the throttle distribution.
 2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
teravus
e9153e1d1a Revert "Merge master into teravuswork", it should have been avination, not master. 
This reverts commit dfac269032, reversing
changes made to 619c39e514.
 2012-11-15 10:05:16 -05:00
teravus
dfac269032 Merge master into teravuswork 2012-11-15 09:46:41 -05: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
Melanie
d9b149b375 Merge branch 'master' into careminster 
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
 2012-11-12 15:46:45 +00:00
SignpostMarv
f560d581bb document & 80-character width terminal formatting 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-11 13:50:38 -08:00
SignpostMarv
23605cf93d converting NPC module to ISharedRegionModule 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-11 13:50:38 -08:00
teravus
4fa088bafb Pipe Throttle Update Event to EventManager, client --> ScenePresence --> 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. 2012-11-04 22:57:24 -05:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
Justin Clark-Casey (justincc)
09f4e72d6a Fix memory leak where removing an NPC did not remove its circuits. 
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.
 2012-10-29 23:22:40 +00: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)
c13a99dc5c Fix script error messages not showing up in viewer 3 and associated viewers. 
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.
 2012-10-25 03:26:12 +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
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
UbitUmarov
ca67ee60ac add missing transactionID in SendInventoryItemCreateUpdate. and make use 
of it on inventoryAccessModule, etc. Most likelly it's needs where there
 is a transactionID not zero
 2012-09-24 21:22:08 +01:00
Melanie
f8603a215d Merge branch 'master' into careminster 
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
 2012-08-23 01:41:47 +01:00
Justin Clark-Casey (justincc)
bcbd450fe4 Add --force flag to "kick user" console command to allow bypassing of recent 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.
 2012-08-20 20:24:54 +01:00
Justin Clark-Casey (justincc)
c42fe6c159 Prevent race conditions when one thread removes an NPC SP before another thread has retreived it after checking whether the NPC exists. 2012-08-14 21:44:06 +01:00
Melanie
4a969b45bd Remove NPC debug spam 2012-08-14 22:02:40 +02:00
Melanie
5546757931 Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination 2012-08-14 21:37:30 +02:00
Melanie
9ec35d09f8 Merge branch 'master' into careminster 2012-08-14 21:43:23 +01:00
Melanie
20b66cf654 Removed more spammy NPC crap 2012-08-14 03:02:43 +02:00
Melanie
12a329eb85 Comment spammy debug 2012-08-14 02:28:23 +02:00
Melanie
ce8b9e6c57 Fix slow loading of task inventory 2012-07-19 12:27:36 +02:00
Melanie
64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc)
3b3d9967b1 Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint. 2012-07-12 23:29:57 +01:00
Melanie
0bc8238a6c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-11 03:56:50 +01:00
Talun
ae1f2114f5 Mantis 6077 trim NPC chat on channel zero. 
This patch trims leading and trailing spaces from NPC chat and
suppresses the sending of empty chat strings on open chat channel 0.
 2012-07-06 22:49:18 +01:00
Talun
1b1f841c6a Mantis 6063 osNpcTouch. 
Allow NPCS to touch obects.
 2012-07-06 22:37:19 +01:00
Melanie
5776351f6a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-05 22:17:39 +01:00
Justin Clark-Casey (justincc)
951b45b80f Add OSSL function osForceAttachToAvatarFromInventory() 
This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first.
Still only attaches objects to the owner of the script.
This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them.
Threat level high.
 2012-07-05 00:05:06 +01:00
Melanie
d893e54f4b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-06-14 00:10:52 +01:00
Justin Clark-Casey (justincc)
cf080a68d6 Remove long obsolete and unused IClientAPI.KillEndDone() 2012-06-13 23:42:22 +01:00
Melanie
fe029cf4e8 Merge branch 'avination' into careminster 2012-05-13 01:25:03 +01:00