OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,438 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

23438 Commits (8fe2308afcd31abd1c0110fc44e78497ad66c231)

Author SHA1 Message Date
BlueWall 276600ab71 Merge branch 'master' into connector_plugin 2012-10-19 07:46:00 -04:00
BlueWall 99bb6c9304 Move PluginManager 
Move PluginManager out to OpenSimFramework for general use
 2012-10-19 07:38:36 -04:00
ubit a936b9b7d3 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-19 04:53:22 +02:00
UbitUmarov b51c26ab40 UbitOde stop doing a copy of the asset data using just the reference to 
it. It costs a lot of cpu and doesn't seem all that usefull.
 2012-10-19 03:50:00 +01:00
Justin Clark-Casey (justincc) f7dcd33008 minor: Increase attachment name field from 36 to 50 chars in "attachments show" report 2012-10-19 03:12:58 +01:00
Justin Clark-Casey (justincc) 6ba42e9e75 Fix a few minor issues in ArchiveReadRequest logging. 2012-10-19 02:54:13 +01:00
Justin Clark-Casey (justincc) 71b73d6dc3 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-19 02:52:12 +01:00
SignpostMarv af5383e479 altering documentation for llGetLinkName, as the current documentation is rather lengthy for a "summary". 2012-10-19 02:48:59 +01:00
SignpostMarv 645e3171b4 since llGetLinkName has a "simplest case", it should be the first check made. 2012-10-19 02:48:59 +01:00
SignpostMarv 597df51f91 the simplest case for llGetLinkName also applies to the LINK_THIS constant 2012-10-19 02:48:59 +01:00
SignpostMarv ec044537d5 ensuring that operand order in llGetLinkName is internally consistent 2012-10-19 02:48:59 +01:00
Melanie d965a23953 Merge branch 'master' into careminster 2012-10-19 01:38:17 +01:00
UbitUmarov 32171708c3 normalize quaternion.Slerp outputs 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-19 01:37:46 +01:00
UbitUmarov 739782627a [UNTESTED] core Ode: let broken mesh physical prims collide with land as 
the defaul basic box so they don't go off world.
 2012-10-19 01:25:30 +01:00
Melanie e5760430c5 Merge branch 'master' into careminster 2012-10-19 01:20:13 +01:00
UbitUmarov 28483150e2 [UNTESTED] core Ode: let broken mesh physical prims collide with land as 
the defaul basic box so they don't go off world.
 2012-10-19 01:19:48 +01:00
Justin Clark-Casey (justincc) 0f70460a32 minor: comment out currently unused logger in DynamicTextureModule 2012-10-19 00:39:18 +01:00
Justin Clark-Casey (justincc) 9417176389 Make "show part" console commands print out information about each item the part contains 2012-10-19 00:37:25 +01:00
UbitUmarov 33a67b691e [UNTESTED] core Ode: stop trying to load a broken asset. Make broken 
assets behave like phantom by Nebadon request
 2012-10-19 00:36:32 +01:00
Melanie 29ab5a6bfe Merge branch 'master' into careminster 2012-10-19 00:32:25 +01:00
Melanie 38e96afa38 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-10-19 00:31:30 +01:00
UbitUmarov b058ba5859 [UNTESTED] core Ode: stop trying to load a broken asset. Make broken 
assets behave like phantom by Nebadon request
 2012-10-19 00:30:48 +01:00
Melanie 453192d721 Merge branch 'ubitwork' into avination 2012-10-19 01:02:07 +02:00
Justin Clark-Casey (justincc) 845228b35e minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDisplayList 2012-10-18 23:58:29 +01:00
Melanie 4fe6d8c3a4 Merge branch 'master' into careminster 2012-10-18 23:48:35 +01:00
Justin Clark-Casey (justincc) 75f5e66d1c Add local and UUID to information output of "show object" and "show part" region console commands 2012-10-18 23:45:07 +01:00
Justin Clark-Casey (justincc) 1f3c9db2b9 Add --full option to "show object name/uuid/pos" to show info on all parts of an object, not just whole object summary information. 2012-10-18 23:41:18 +01:00
Justin Clark-Casey (justincc) 8aa43e72e5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-18 23:32:40 +01:00
Melanie 8ce7ab721d Merge branch 'ubitwork' into avination 2012-10-19 00:12:30 +02:00
Justin Clark-Casey (justincc) a960273e91 Add number of inventory items to information displayed via "show part" console command 2012-10-18 23:02:57 +01:00
Melanie f6e1f7a4af Merge branch 'master' into careminster 2012-10-18 21:24:38 +01:00
Melanie a2c93133be Remove extraneous calls to the now commented CheckSculptAndLoad 2012-10-18 21:23:57 +01:00
UbitUmarov afab5f5cd1 extend coment to include all unused SOG CheckSculptAndLoad() 2012-10-18 21:13:25 +01:00
UbitUmarov 7ab83f9eb2 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now

Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-18 21:13:02 +01:00
UbitUmarov de44e93aa2 missing changed file 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-18 20:58:34 +01:00
UbitUmarov 1e7fb2dc36 i update core ode plugin and make it load is meshs (i hope) 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-18 20:58:12 +01:00
Melanie 72c925a6c9 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs
 2012-10-18 20:56:34 +01:00
Melanie caf2dcde70 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
 2012-10-18 20:42:43 +01:00
ubit c9cbdc5eaf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-18 16:36:02 +02:00
UbitUmarov 7228ad7a51 extend coment to include all unused SOG CheckSculptAndLoad() 2012-10-18 15:30:42 +01:00
Melanie 2e8e8d576e Remove redundant and annoyingly modal message box in upload processing. 2012-10-18 13:20:50 +02:00
Justin Clark-Casey (justincc) 991151250d If we're avoiding printing a long request warning for a GetTexture CAP call, check we received a request handler first since this is not guaranteed. 
Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
 2012-10-18 00:39:43 +01:00
Justin Clark-Casey (justincc) 0811f3d28d minor: Remove event method doc from LLClientView that I forgot in the last commit (1de80c) 2012-10-18 00:34:10 +01:00
Melanie 3651cc0378 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2012-10-18 00:06:43 +01:00
Justin Clark-Casey (justincc) 1de80cdafe minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into IClientAPI from LLClientView 2012-10-18 00:04:23 +01:00
Justin Clark-Casey (justincc) 3ec2923022 Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of which there are 10 a second) rather than constructing a new one every time. 
We can do this because AgentUpdate packets are handled synchronously.
 2012-10-17 23:54:05 +01:00
Melanie 9b68446811 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-10-17 23:50:48 +01:00
Justin Clark-Casey (justincc) faf6b56839 Explicitly return only the incoming AgentUpdate packet as this is the only one we pool atm, rather than attempting to return all incoming packets. 2012-10-17 23:08:14 +01:00
Justin Clark-Casey (justincc) 2ed59ad8ac If RecycleBaseUDPPackets = true, also pool IncomingPackets to reduce memory churn 2012-10-17 21:08:15 +01:00
Melanie 0ca9666932 Merge branch 'ubitwork' into avination 2012-10-17 20:46:38 +02:00